diff options
| author | Matt Harding <majaharding@gmail.com> | 2024-02-13 04:37:31 +0000 |
|---|---|---|
| committer | Matt Harding <majaharding@gmail.com> | 2024-02-16 09:26:30 +0000 |
| commit | 80459c14a4a6d9613d2bc07f5f0df905e8f99a0d (patch) | |
| tree | ab71a467b26e45475e0fd42685d3f95e91a45d8f /src/ci/scripts/install-mingw.sh | |
| parent | e3450ad19b6b5a6a67ba5bfdae53ac826953ba2a (diff) | |
| download | rust-80459c14a4a6d9613d2bc07f5f0df905e8f99a0d.tar.gz rust-80459c14a4a6d9613d2bc07f5f0df905e8f99a0d.zip | |
Changes to CI related to mingw and MSYS
Diffstat (limited to 'src/ci/scripts/install-mingw.sh')
| -rwxr-xr-x | src/ci/scripts/install-mingw.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 7eccb9b8650..87b835b63db 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -38,11 +38,11 @@ if isWindows; then ;; esac - if [[ "${CUSTOM_MINGW-0}" -ne 1 ]]; then - pacman -S --noconfirm --needed mingw-w64-$arch-toolchain mingw-w64-$arch-cmake \ - mingw-w64-$arch-gcc \ - mingw-w64-$arch-python # the python package is actually for python3 - ciCommandAddPath "$(ciCheckoutPath)/msys2/mingw${bits}/bin" + if [[ "${CUSTOM_MINGW:-0}" == 0 ]]; then + pacboy -S --noconfirm toolchain:p + # According to the comment in the Windows part of install-clang.sh, in the future we might + # want to do this instead: + # pacboy -S --noconfirm clang:p ... else mingw_dir="mingw${bits}" |