Skip to content

Commit 8f2dcb6

Browse files
committed
add back sysroot
1 parent 18dffd2 commit 8f2dcb6

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

.github/workflows/CI.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ jobs:
3535
rustup target add aarch64-apple-darwin
3636
pip install maturin
3737
eval "$(brew shellenv)"
38+
export MACOSX_DEPLOYMENT_TARGET=10.14
3839
export LIBCLANG_PATH=${HOMEBREW_PREFIX}/opt/llvm@19/lib
3940
export CC=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang
4041
export CXX=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang++
4142
export AR=${HOMEBREW_PREFIX}/opt/llvm@19/bin/llvm-ar
42-
export CFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14"
43-
export CXXFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14"
43+
export CFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
44+
export CXXFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
4445
export LLD=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld
4546
export RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${LLD}"
4647
maturin build --release --target aarch64-apple-darwin --out dist -i ${{ matrix.py_version }}

.github/workflows/PR.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,13 @@ jobs:
3535
rustup target add aarch64-apple-darwin
3636
pip install maturin
3737
eval "$(brew shellenv)"
38+
export MACOSX_DEPLOYMENT_TARGET=10.14
3839
export LIBCLANG_PATH=${HOMEBREW_PREFIX}/opt/llvm@19/lib
3940
export CC=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang
4041
export CXX=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang++
4142
export AR=${HOMEBREW_PREFIX}/opt/llvm@19/bin/llvm-ar
42-
export CFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14"
43-
export CXXFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14"
43+
export CFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
44+
export CXXFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk"
4445
export LLD=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld
4546
export RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${LLD}"
4647
maturin build --release --target aarch64-apple-darwin --out dist -i ${{ matrix.py_version }}

justfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ develop:
88
CC=${HOMEBREW_PREFIX}/opt/llvm/bin/clang \
99
CXX=${HOMEBREW_PREFIX}/opt/llvm/bin/clang++ \
1010
AR=${HOMEBREW_PREFIX}/opt/llvm/bin/llvm-ar \
11-
CFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14" \
12-
CXXFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14" \
11+
CFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \
12+
CXXFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \
1313
RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld" \
1414
maturin develop --release --verbose
1515

@@ -20,8 +20,8 @@ build:
2020
CC=${HOMEBREW_PREFIX}/opt/llvm/bin/clang \
2121
CXX=${HOMEBREW_PREFIX}/opt/llvm/bin/clang++ \
2222
AR=${HOMEBREW_PREFIX}/opt/llvm/bin/llvm-ar \
23-
CFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14" \
24-
CXXFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14" \
23+
CFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \
24+
CXXFLAGS="-flto=thin -O3 -mmacosx-version-min=10.14 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \
2525
RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld" \
2626
maturin build --release --verbose
2727

0 commit comments

Comments
 (0)