Skip to content

Commit b7531a9

Browse files
committed
Revert "."
This reverts commit 52e9dc3.
1 parent 11887c3 commit b7531a9

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/ci/scripts/install-msys2.sh

+11-11
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ if isWindows; then
1212
# subdirectory for each installed Python version.
1313
#
1414
# The -V flag of the sort command sorts the input by version number.
15-
# native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)"
15+
native_python_version="$(ls /c/hostedtoolcache/windows/Python | sort -Vr | head -n 1)"
1616

17-
# # Make sure we use the native python interpreter instead of some msys equivalent
18-
# # one way or another. The msys interpreters seem to have weird path conversions
19-
# # baked in which break LLVM's build system one way or another, so let's use the
20-
# # native version which keeps everything as native as possible.
21-
# python_home="/c/hostedtoolcache/windows/Python/${native_python_version}/x64"
22-
# if ! [[ -f "${python_home}/python3.exe" ]]; then
23-
# cp "${python_home}/python.exe" "${python_home}/python3.exe"
24-
# fi
25-
# ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
26-
# ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
17+
# Make sure we use the native python interpreter instead of some msys equivalent
18+
# one way or another. The msys interpreters seem to have weird path conversions
19+
# baked in which break LLVM's build system one way or another, so let's use the
20+
# native version which keeps everything as native as possible.
21+
python_home="/c/hostedtoolcache/windows/Python/${native_python_version}/x64"
22+
if ! [[ -f "${python_home}/python3.exe" ]]; then
23+
cp "${python_home}/python.exe" "${python_home}/python3.exe"
24+
fi
25+
ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64"
26+
ciCommandAddPath "C:\\hostedtoolcache\\windows\\Python\\${native_python_version}\\x64\\Scripts"
2727

2828
# Install pacboy for easily installing packages
2929
pacman -S --noconfirm pactoys

0 commit comments

Comments
 (0)