diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2025-02-10 12:16:27 +0000 |
|---|---|---|
| committer | Josh Stone <jistone@redhat.com> | 2025-03-21 17:16:14 -0700 |
| commit | 6a2ca0d4d7840fd197d8c4ef832e8b1fcedfa251 (patch) | |
| tree | 061d04bd0b34538b7c0afde2229711588be475d6 | |
| parent | 8c7969a3ae4a292789a415618fd3ebd35bee38e9 (diff) | |
| download | rust-6a2ca0d4d7840fd197d8c4ef832e8b1fcedfa251.tar.gz rust-6a2ca0d4d7840fd197d8c4ef832e8b1fcedfa251.zip | |
Prevent /msys64/bin from being prepended to PATH
(cherry picked from commit 5573cd320cd80f6ed9d44aa6129570380280f0fd)
| -rwxr-xr-x | src/ci/scripts/install-mingw.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 91eab2e7a08..c8c501e646a 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -32,6 +32,12 @@ if isWindows && isKnownToBeMingwBuild; then ;; esac + # Stop /msys64/bin from being prepended to PATH by adding the bin directory manually. + # Note that this intentionally uses a Windows style path instead of the msys2 path to + # avoid being auto-translated into `/usr/bin`, which will not have the desired effect. + msys2Path="c:/msys64" + ciCommandAddPath "${msys2Path}/usr/bin" + mingw_dir="mingw${bits}" curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}" |