diff options
| author | Pietro Albini <pietro@pietroalbini.org> | 2020-03-18 21:11:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-18 21:11:11 +0100 |
| commit | 94ed0719f7ab083e4c94651a608ae49e14653e6a (patch) | |
| tree | 0dc41b23dbe3fda1dbc8e69548e7060adcea0fd1 /src/ci/scripts | |
| parent | 11053bafac5bdb00f37cb040a19779474e778a35 (diff) | |
| parent | 779e5922eeae915cac3470f6f4b33f78fc740d80 (diff) | |
| download | rust-94ed0719f7ab083e4c94651a608ae49e14653e6a.tar.gz rust-94ed0719f7ab083e4c94651a608ae49e14653e6a.zip | |
Rollup merge of #70116 - pietroalbini:ci-fix-windows-python-path, r=Mark-Simulacrum
ci: use python from the correct path Apparently the old path we were using for Python 2 on Windows was not documented, and eventually got removed. This switches our CI to use the correct path. See https://github.com/rust-lang/rust/pull/70112#issuecomment-600760786 for the actual failure.
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-msys2-packages.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh index 843a2bf2d5e..22b9854ad5e 100755 --- a/src/ci/scripts/install-msys2-packages.sh +++ b/src/ci/scripts/install-msys2-packages.sh @@ -13,6 +13,7 @@ if isWindows; then # one way or another. The msys interpreters seem to have weird path conversions # baked in which break LLVM's build system one way or another, so let's use the # native version which keeps everything as native as possible. - cp C:/Python27amd64/python.exe C:/Python27amd64/python2.7.exe - ciCommandAddPath "C:\\Python27amd64" + python_home="C:/hostedtoolcache/windows/Python/2.7.17/x64" + cp "${python_home}/python.exe" "${python_home}/python2.7.exe" + ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\2.7.17\\x64" fi |