Skip to content

Commit

Permalink
Auto merge of #1454 - mati865:patch-1, r=gnzlbg
Browse files Browse the repository at this point in the history
MinGW: also copy libmingwex.a from C toolchain

Fixes recent CI error:
```
note: C:\Program Files (x86)\Rust\lib\rustlib\i686-pc-windows-gnu\lib/libmsvcrt.a(dyims01169.o):(.text+0x0): multiple definition of `longjmp'
          C:\Program Files (x86)\Rust\lib\rustlib\i686-pc-windows-gnu\lib/libmingwex.a(lib32_libmingwex_a-mingw_getsp.o):mingw_getsp.S:(.text+0x5): first defined here
```

Successful build: https://ci.appveyor.com/project/mati865/libc/builds/26425673
It also should be added to Azure in #1376
  • Loading branch information
bors committed Aug 2, 2019
2 parents 2b01f7e + 63fd0f5 commit 04d7ccc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -14,7 +14,7 @@ install:
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
- rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
- set PATH=%PATH%;C:\Program Files (x86)\Rust\bin
- if defined MSYS_BITS for %%I in (crt2.o dllcrt2.o libmsvcrt.a) do xcopy /Y "C:\msys64\mingw%MSYS_BITS%\%ARCH%-w64-mingw32\lib\%%I" "C:\Program Files (x86)\Rust\lib\rustlib\%TARGET%\lib"
- if defined MSYS_BITS for %%I in (crt2.o dllcrt2.o libmingwex.a libmsvcrt.a) do xcopy /Y "C:\msys64\mingw%MSYS_BITS%\%ARCH%-w64-mingw32\lib\%%I" "C:\Program Files (x86)\Rust\lib\rustlib\%TARGET%\lib"
- rustc -V
- cargo -V

Expand Down

0 comments on commit 04d7ccc

Please sign in to comment.