diff options
| author | Chris Denton <chris@chrisdenton.dev> | 2025-02-10 12:16:27 +0000 |
|---|---|---|
| committer | Chris Denton <chris@chrisdenton.dev> | 2025-02-10 15:03:44 +0000 |
| commit | 5573cd320cd80f6ed9d44aa6129570380280f0fd (patch) | |
| tree | e258d8d7766d9b1f5dc41441c4a773f06fcf1684 /src/ci/scripts | |
| parent | 80c091958f05e573433df974f8d2f2bc3a3eadfb (diff) | |
| download | rust-5573cd320cd80f6ed9d44aa6129570380280f0fd.tar.gz rust-5573cd320cd80f6ed9d44aa6129570380280f0fd.zip | |
Prevent /msys64/bin from being prepended to PATH
Diffstat (limited to 'src/ci/scripts')
| -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}" |