Skip to content

Commit 1a8aaba

Browse files
committed
Group common Osx build flags
1 parent d5380da commit 1a8aaba

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

.github/workflows/compile.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -460,11 +460,13 @@ jobs:
460460
matrix:
461461
include:
462462
- build: 'arm64'
463-
defines: '-DCMAKE_OSX_ARCHITECTURES=arm64 -DGGML_METAL_EMBED_LIBRARY=ON -DCMAKE_INSTALL_RPATH=''@loader_path'' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON '
463+
defines: '-DCMAKE_OSX_ARCHITECTURES=arm64 -DGGML_METAL_EMBED_LIBRARY=ON'
464464
- build: 'x64'
465-
defines: '-DCMAKE_OSX_ARCHITECTURES=x86_64 -DGGML_METAL=OFF -DGGML_AVX=ON -DGGML_AVX2=ON -DCMAKE_INSTALL_RPATH=''@loader_path'' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON '
465+
defines: '-DCMAKE_OSX_ARCHITECTURES=x86_64 -DGGML_METAL=OFF -DGGML_AVX=ON -DGGML_AVX2=ON'
466466
- build: 'x64-rosetta2'
467-
defines: '-DCMAKE_OSX_ARCHITECTURES=x86_64 -DGGML_METAL=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF -DCMAKE_INSTALL_RPATH=''@loader_path'' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON '
467+
defines: '-DCMAKE_OSX_ARCHITECTURES=x86_64 -DGGML_METAL=OFF -DGGML_AVX=OFF -DGGML_AVX2=OFF'
468+
env:
469+
MACOS_RPATH_DEFINE: "-DCMAKE_INSTALL_RPATH='@loader_path' -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON"
468470
runs-on: macos-latest
469471
steps:
470472
- uses: actions/checkout@v4
@@ -481,7 +483,7 @@ jobs:
481483
run: |
482484
mkdir build
483485
cd build
484-
cmake .. ${{ env.COMMON_DEFINE }} ${{ matrix.defines }}
486+
cmake .. ${{ env.COMMON_DEFINE }} ${{ env.MACOS_RPATH_DEFINE }} ${{ matrix.defines }}
485487
cmake --build . --config Release -j ${env:NUMBER_OF_PROCESSORS}
486488
ls -R
487489
- name: Upload ggml

0 commit comments

Comments
 (0)