Skip to content

gh-126464 Fix jit build on aarch64 macos #126494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 7, 2024
Merged

gh-126464 Fix jit build on aarch64 macos #126494

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02ed6c6
Update xcode command line tools for jit build on macos
alonme Nov 6, 2024
bf10e2a
Missing uncomment
alonme Nov 6, 2024
add0953
Use SDKROOT to find include paths
alonme Nov 6, 2024
d990073
Merge branch 'main' into fix-mac-jit-ci
alonme Nov 7, 2024
399986e
export sdkroot instead of repeating its addition per command
alonme Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions .github/workflows/jit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- x86_64-pc-windows-msvc/msvc
- aarch64-pc-windows-msvc/msvc
- x86_64-apple-darwin/clang
# - aarch64-apple-darwin/clang
- aarch64-apple-darwin/clang
- x86_64-unknown-linux-gnu/gcc
- x86_64-unknown-linux-gnu/clang
- aarch64-unknown-linux-gnu/gcc
Expand All @@ -79,11 +79,10 @@ jobs:
architecture: x86_64
runner: macos-13
compiler: clang
# GH-126464: A recent change to either GHA or LLVM broke this job:
# - target: aarch64-apple-darwin/clang
# architecture: aarch64
# runner: macos-14
# compiler: clang
- target: aarch64-apple-darwin/clang
architecture: aarch64
runner: macos-14
compiler: clang
- target: x86_64-unknown-linux-gnu/gcc
architecture: x86_64
runner: ubuntu-22.04
Expand Down Expand Up @@ -134,7 +133,7 @@ jobs:
brew install llvm@${{ matrix.llvm }}
SDKROOT="$(xcrun --show-sdk-path)" \
./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }}
make all --jobs 4
SDKROOT="$(xcrun --show-sdk-path)" make all --jobs 4
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we're doing this on line 134 too, maybe just remove both and put export SDKROOT="$(xcrun --show-sdk-path)" before the ./configure step?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!
Done

./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3

- name: Native Linux
Expand Down
Loading