diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bf2623f..e05b182 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -19,6 +19,7 @@ jobs: - name: Install llvm-19 run: | brew update + brew install cmake brew install llvm@19 brew install lld - uses: actions/setup-python@v5 @@ -40,8 +41,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 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" - export CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + export CFLAGS="-flto=thin -O3" + export CXXFLAGS="-flto=thin -O3" 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 }} diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml index 6a1b770..00ac1ee 100644 --- a/.github/workflows/PR.yml +++ b/.github/workflows/PR.yml @@ -19,6 +19,7 @@ jobs: - name: Install llvm-19 run: | brew update + brew install cmake brew install llvm@19 brew install lld - uses: actions/setup-python@v5 @@ -40,8 +41,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 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" - export CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" + export CFLAGS="-flto=thin -O3" + export CXXFLAGS="-flto=thin -O3" 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 }} diff --git a/justfile b/justfile index 03a313e..727bcb0 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 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \ - CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \ + CFLAGS="-flto=thin -O3" \ + CXXFLAGS="-flto=thin -O3" \ 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 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \ - CXXFLAGS="-flto=thin -O3 --sysroot=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk" \ + CFLAGS="-flto=thin -O3" \ + CXXFLAGS="-flto=thin -O3" \ 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 --config-system-dir=${HOMEBREW_PREFIX}/etc/clang" \ - CXXFLAGS="-flto=thin -O3 --config-system-dir=${HOMEBREW_PREFIX}/etc/clang" \ + CFLAGS="-flto=thin -O3" \ + CXXFLAGS="-flto=thin -O3" \ 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