Skip to content

Commit b760196

Browse files
bors3tilley
authored andcommitted
Auto merge of rust-lang#117436 - nikic:update-llvm-16, r=cuviper
Update to LLVM 17.0.4 Fixes rust-lang#116668. Fixes rust-lang#116941. Fixes rust-lang#116976. r? `@cuviper`
2 parents 815b3ae + 9df857f commit b760196

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/llvm-project

Submodule llvm-project updated 67 files

x

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# directly use python in the x.py shebang and have it consistently work. Instead we
66
# have a shell script to look for a python to run x.py.
77

8-
set -eu
8+
set -eux
99

1010
# syntax check
1111
sh -n "$0"
@@ -25,7 +25,10 @@ xpy=$(dirname "$(realpath "$0")")/x.py
2525

2626
# On Windows, `py -3` sometimes works. We need to try it first because `python3`
2727
# sometimes tries to launch the app store on Windows.
28-
for SEARCH_PYTHON in py python3 python python2; do
28+
29+
# TODO: Check in python3 is a symlink to the below
30+
# /c/Users/Max/AppData/Local/Microsoft/WindowsApps/python3 -> '/c/Program Files/WindowsApps/Microsoft.DesktopAppInstaller_1.21.2771.0_x64__8wekyb3d8bbwe/AppInstallerPythonRedirector.exe'*
31+
for SEARCH_PYTHON in py python python3 python2; do
2932
if python=$(command -v $SEARCH_PYTHON) && [ -x "$python" ]; then
3033
if [ $SEARCH_PYTHON = py ]; then
3134
extra_arg="-3"

0 commit comments

Comments
 (0)