diff options
| author | Guillaume Gomez <guillaume1.gomez@gmail.com> | 2019-11-21 13:57:40 +0100 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2020-04-10 09:09:58 -0400 |
| commit | 38eb369fa4d06e55869a8fae62796a7b0085a5bd (patch) | |
| tree | a2f010105a6087ba68ff8ca3bf9371633463739d /src/ci/scripts | |
| parent | 42abbd8878d3b67238f3611b0587c704ba94f39c (diff) | |
| download | rust-38eb369fa4d06e55869a8fae62796a7b0085a5bd.tar.gz rust-38eb369fa4d06e55869a8fae62796a7b0085a5bd.zip | |
Enforce Python 3 as much as possible
Diffstat (limited to 'src/ci/scripts')
| -rwxr-xr-x | src/ci/scripts/install-mingw.sh | 5 | ||||
| -rwxr-xr-x | src/ci/scripts/install-msys2-packages.sh | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 78728dd7d00..ae85d5cab01 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -50,8 +50,9 @@ 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-python2 + 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" else mingw_dir="mingw${bits}" diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh index 22b9854ad5e..3874a86e120 100755 --- a/src/ci/scripts/install-msys2-packages.sh +++ b/src/ci/scripts/install-msys2-packages.sh @@ -13,7 +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. - 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" + python_home="C:/hostedtoolcache/windows/Python/3.7.6/x64" + cp "${python_home}/python.exe" "${python_home}/python3.exe" + ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\3.7.6\\x64" fi |