diff options
| author | gnzlbg <gonzalobg88@gmail.com> | 2019-07-12 12:35:36 +0200 |
|---|---|---|
| committer | gnzlbg <gonzalobg88@gmail.com> | 2019-07-27 13:25:22 +0200 |
| commit | 23b80729e225c5fe8339dea87ff766ae36c4efbf (patch) | |
| tree | 228013c625a794e742ef67f289487d7b2909431a /ci | |
| parent | 2f25959d05e50fb4a8a0c55305d7024aa473b52c (diff) | |
| download | rust-libc-23b80729e225c5fe8339dea87ff766ae36c4efbf.tar.gz | |
Use matis bash script instead of batch for fixing mingw on windows
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/azure-install-rust.yml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ci/azure-install-rust.yml b/ci/azure-install-rust.yml index c94f3dcd02..077a05efb4 100644 --- a/ci/azure-install-rust.yml +++ b/ci/azure-install-rust.yml @@ -46,10 +46,13 @@ steps: find "C:\ProgramData\Chocolatey" -name "libmsvcrt*" condition: eq( variables['Agent.OS'], 'Windows_NT' ) displayName: Find GCC libraries (windows) - - script: | - @echo on - if not defined TOOLCHAIN set TOOLCHAIN=nightly - if defined ARCH_BITS for %%I in (crt2.o dllcrt2.o libmsvcrt.a) do xcopy /Y "C:\ProgramData\Chocolatey\lib\mingw\tools\install\mingw%ARCH_BITS%\%ARCH%-w64-mingw32\lib\%%I" "C:\Program Files\Rust\.rustup\toolchains\%TOOLCHAIN%-%TARGET%\lib\rustlib\%TARGET%\lib\%%I" + - bash: | + set -ex + if [[ -n ${ARCH_BITS} ]]; then + for i in crt2.o dllcrt2.o libmsvcrt.a ; do + cp -f "/C/ProgramData/Chocolatey/lib/mingw/tools/install/mingw${ARCH_BITS}/${ARCH}-w64-mingw32/lib/$i" "`rustc --print sysroot`/lib/rustlib/${TARGET}/lib" + done + fi condition: eq( variables['Agent.OS'], 'Windows_NT' ) displayName: Fix MinGW (windows) - bash: | |