diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 07b073e..07e823a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -40,8 +40,8 @@ jobs: export CC=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang export CXX=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang++ export AR=${HOMEBREW_PREFIX}/opt/llvm@19/bin/llvm-ar - export CFLAGS="-flto=thin -O3" - export CXXFLAGS="-flto=thin -O3" + export CFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + export CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" export LLD=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld export RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${LLD}" maturin build --release --target aarch64-apple-darwin --out dist -i ${{ matrix.py_version }} @@ -109,7 +109,7 @@ jobs: name: wheels-win-${{ matrix.py_version }} path: dist - manylinux_2_28: + manylinux_2_28_x86_64: runs-on: ubuntu-latest strategy: fail-fast: false @@ -152,7 +152,7 @@ jobs: name: wheels-manylinux_2_28-${{ matrix.target }} path: dist - manylinux2014: + manylinux2014_x86_64: runs-on: ubuntu-latest strategy: fail-fast: false @@ -275,13 +275,21 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-manylinux_2014-${{ matrix.target }} + name: wheels-manylinux2014-${{ matrix.target }} path: dist release: name: Release runs-on: ubuntu-latest - needs: [windows, manylinux_2_28, manylinux2014, macos, linux-cross] + needs: + [ + windows, + macos, + manylinux_2_28_x86_64, + manylinux2014_x86_64, + manylinux_2_28_arm64, + manylinux2014_arm64, + ] steps: - uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index fa9ff42..96347f0 100644 --- a/.github/workflows/PR.yml +++ b/.github/workflows/PR.yml @@ -40,8 +40,8 @@ jobs: export CC=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang export CXX=${HOMEBREW_PREFIX}/opt/llvm@19/bin/clang++ export AR=${HOMEBREW_PREFIX}/opt/llvm@19/bin/llvm-ar - export CFLAGS="-flto=thin -O3" - export CXXFLAGS="-flto=thin -O3" + export CFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + export CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" export LLD=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld export RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${LLD}" maturin build --release --target aarch64-apple-darwin --out dist -i ${{ matrix.py_version }} @@ -109,7 +109,7 @@ jobs: name: wheels-win-${{ matrix.py_version }} path: dist - manylinux_2_28: + manylinux_2_28_x86_64: runs-on: ubuntu-latest strategy: fail-fast: false @@ -152,7 +152,7 @@ jobs: name: wheels-manylinux_2_28-${{ matrix.target }} path: dist - manylinux2014: + manylinux2014_x86_64: runs-on: ubuntu-latest strategy: fail-fast: false @@ -275,5 +275,5 @@ jobs: - name: Upload wheels uses: actions/upload-artifact@v4 with: - name: wheels-manylinux_2014-${{ matrix.target }} + name: wheels-manylinux2014-${{ matrix.target }} path: dist diff --git a/justfile b/justfile index 727bcb0..03a313e 100644 --- a/justfile +++ b/justfile @@ -8,8 +8,8 @@ develop: CC=${HOMEBREW_PREFIX}/opt/llvm/bin/clang \ CXX=${HOMEBREW_PREFIX}/opt/llvm/bin/clang++ \ AR=${HOMEBREW_PREFIX}/opt/llvm/bin/llvm-ar \ - CFLAGS="-flto=thin -O3" \ - CXXFLAGS="-flto=thin -O3" \ + CFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \ + CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \ RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld" \ maturin develop --release --verbose @@ -20,8 +20,8 @@ build: CC=${HOMEBREW_PREFIX}/opt/llvm/bin/clang \ CXX=${HOMEBREW_PREFIX}/opt/llvm/bin/clang++ \ AR=${HOMEBREW_PREFIX}/opt/llvm/bin/llvm-ar \ - CFLAGS="-flto=thin -O3" \ - CXXFLAGS="-flto=thin -O3" \ + CFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \ + CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \ RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld" \ maturin build --release --verbose @@ -30,7 +30,7 @@ bin: CC=${HOMEBREW_PREFIX}/opt/llvm/bin/clang \ CXX=${HOMEBREW_PREFIX}/opt/llvm/bin/clang++ \ AR=${HOMEBREW_PREFIX}/opt/llvm/bin/llvm-ar \ - CFLAGS="-flto=thin -O3" \ - CXXFLAGS="-flto=thin -O3" \ + CFLAGS="-flto=thin -O3 --config-system-dir=${HOMEBREW_PREFIX}/etc/clang" \ + CXXFLAGS="-flto=thin -O3 --config-system-dir=${HOMEBREW_PREFIX}/etc/clang" \ RUSTFLAGS="-Clinker-plugin-lto -Clinker=$PWD/macos-linker.sh -Clink-arg=-fuse-ld=${HOMEBREW_PREFIX}/opt/lld/bin/ld64.lld" \ cargo build --release --bin create_cf_db