Skip to content

Commit 5afd8ff

Browse files
authored
Rollup merge of #149516 - mati865:no-msys2, r=jieyouxu
Stop adding MSYS2 to PATH Rust no longer requires MSYS2 provided tools like make.
2 parents 7cb02f9 + 662192a commit 5afd8ff

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

src/ci/scripts/install-mingw.sh

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ if isWindows && isKnownToBeMingwBuild; then
4747
;;
4848
esac
4949

50-
# Stop /msys64/bin from being prepended to PATH by adding the bin directory manually.
51-
# Note that this intentionally uses a Windows style path instead of the msys2 path to
52-
# avoid being auto-translated into `/usr/bin`, which will not have the desired effect.
53-
msys2Path="c:/msys64"
54-
ciCommandAddPath "${msys2Path}/usr/bin"
55-
5650
case "${mingw_archive}" in
5751
*.7z)
5852
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
@@ -73,12 +67,4 @@ if isWindows && isKnownToBeMingwBuild; then
7367
esac
7468

7569
ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"
76-
77-
# MSYS2 is not installed on AArch64 runners
78-
if [[ "${CI_JOB_NAME}" != *aarch64-llvm* ]]; then
79-
# Initialize mingw for the user.
80-
# This should be done by github but isn't for some reason.
81-
# (see https://github.com/actions/runner-images/issues/12600)
82-
/c/msys64/usr/bin/bash -lc ' '
83-
fi
8470
fi

0 commit comments

Comments
 (0)