From 52e9dc32b9fdb3ad56430ba0f8ebef418d7a7754 Mon Sep 17 00:00:00 2001 From: Matt Harding Date: Tue, 13 Feb 2024 07:33:43 +0000 Subject: [PATCH] . --- src/ci/scripts/install-msys2.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/ci/scripts/install-msys2.sh b/src/ci/scripts/install-msys2.sh index f668223e9700f..3414b2d15c02a 100755 --- a/src/ci/scripts/install-msys2.sh +++ b/src/ci/scripts/install-msys2.sh @@ -12,18 +12,18 @@ if isWindows; then # 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)" + # 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" - if ! [[ -f "${python_home}/python3.exe" ]]; then - cp "${python_home}/python.exe" "${python_home}/python3.exe" - fi - ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64" - ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts" + # # 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" + # if ! [[ -f "${python_home}/python3.exe" ]]; then + # cp "${python_home}/python.exe" "${python_home}/python3.exe" + # fi + # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64" + # ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts" # Install pacboy for easily installing packages pacman -S --noconfirm pactoys