diff options
| author | bors <bors@rust-lang.org> | 2020-07-26 16:09:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-26 16:09:42 +0000 |
| commit | c367798cfd3817ca6ae908ce675d1d99242af148 (patch) | |
| tree | 3c697026c11f13b35d61371c36921e6b3d1de1ca /src/ci/scripts/install-msys2-packages.sh | |
| parent | 14485ee1257703df51313efe39daf35e886e4dac (diff) | |
| parent | 41895ca93f3722adf5855089442de3abc94458f0 (diff) | |
| download | rust-1.45.1.tar.gz rust-1.45.1.zip | |
Auto merge of #74746 - wesleywiser:stable_backport_73669, r=Mark-Simulacrum 1.45.1
Stable backport of #73613 This is the backport of #73613 to stable. r? @ghost cc @Mark-Simulacrum In addition the tests added in the original PR passing, I've also confirmed that the test case in #74739 works correctly.
Diffstat (limited to 'src/ci/scripts/install-msys2-packages.sh')
| -rwxr-xr-x | src/ci/scripts/install-msys2-packages.sh | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/src/ci/scripts/install-msys2-packages.sh b/src/ci/scripts/install-msys2-packages.sh deleted file mode 100755 index ff7479c05d0..00000000000 --- a/src/ci/scripts/install-msys2-packages.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -set -euo pipefail -IFS=$'\n\t' - -source "$(cd "$(dirname "$0")" && pwd)/../shared.sh" - -if isWindows; then - pacman -S --noconfirm --needed base-devel ca-certificates make diffutils tar \ - binutils - - # Detect the native Python version installed on the agent. On GitHub - # Actions, the C:\hostedtoolcache\windows\Python directory contains a - # subdirectory for each installed Python version. - # - # The -V flag of the sort command sorts the input by version number. - native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)" - - # Make sure we use the native python interpreter instead of some msys equivalent - # 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/${native_python_version}/x64" - cp "${python_home}/python.exe" "${python_home}/python3.exe" - ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64" - ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts" -fi |
