From 02ed6c60e37f1bcd1cb18bf831612d28e9463d12 Mon Sep 17 00:00:00 2001 From: AlonMenczer Date: Wed, 6 Nov 2024 14:51:46 +0200 Subject: [PATCH 1/4] Update xcode command line tools for jit build on macos --- .github/workflows/jit.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index 897c692118e9a4..cd3a85f4da55cc 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -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 @@ -132,6 +131,7 @@ jobs: brew update find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete brew install llvm@${{ matrix.llvm }} + softwareupdate -i "Command Line Tools for Xcode-16.1" SDKROOT="$(xcrun --show-sdk-path)" \ ./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }} make all --jobs 4 From bf10e2a19701e9ceb2cf31cc706adc1042c0af86 Mon Sep 17 00:00:00 2001 From: AlonMenczer Date: Wed, 6 Nov 2024 15:10:34 +0200 Subject: [PATCH 2/4] Missing uncomment --- .github/workflows/jit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index cd3a85f4da55cc..e3e9efa67db6bf 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -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 From add09536954ebc8a38ea8f51ed9f03869767c90b Mon Sep 17 00:00:00 2001 From: AlonMenczer Date: Thu, 7 Nov 2024 01:45:44 +0200 Subject: [PATCH 3/4] Use SDKROOT to find include paths --- .github/workflows/jit.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index e3e9efa67db6bf..ed22bac9197e7c 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -131,10 +131,9 @@ jobs: brew update find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete brew install llvm@${{ matrix.llvm }} - softwareupdate -i "Command Line Tools for Xcode-16.1" 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 ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - name: Native Linux From 399986e452745145cac04eda69097140113eccb7 Mon Sep 17 00:00:00 2001 From: AlonMenczer Date: Thu, 7 Nov 2024 08:44:33 +0200 Subject: [PATCH 4/4] export sdkroot instead of repeating its addition per command --- .github/workflows/jit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/jit.yml b/.github/workflows/jit.yml index ed22bac9197e7c..35d5d59b762660 100644 --- a/.github/workflows/jit.yml +++ b/.github/workflows/jit.yml @@ -131,9 +131,9 @@ jobs: brew update find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete brew install llvm@${{ matrix.llvm }} - SDKROOT="$(xcrun --show-sdk-path)" \ - ./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }} - SDKROOT="$(xcrun --show-sdk-path)" make all --jobs 4 + export SDKROOT="$(xcrun --show-sdk-path)" + ./configure --enable-experimental-jit ${{ matrix.debug && '--with-pydebug' || '--enable-optimizations --with-lto' }} + make all --jobs 4 ./python.exe -m test --multiprocess 0 --timeout 4500 --verbose2 --verbose3 - name: Native Linux