From 0bc64c4829dd98ee1db577929b14c6532122a3bf Mon Sep 17 00:00:00 2001 From: Mark Spanbroek Date: Mon, 14 Nov 2022 10:39:02 +0100 Subject: [PATCH 1/2] [build] Only build `libleopard` Do not build `bench_leopard` and `experiment_leopard`. --- leopard/wrapper.nim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/leopard/wrapper.nim b/leopard/wrapper.nim index 05a6626..f6fba2d 100644 --- a/leopard/wrapper.nim +++ b/leopard/wrapper.nim @@ -123,7 +123,7 @@ static: discard bash("mkdir -p", buildDirUnix) let cmd = @["cd", buildDirUnix, "&& cmake", leopardDirUnix, LeopardCmakeFlags, - "&& make"] + "&& make libleopard"] echo "\nBuilding Leopard-RS: " & cmd.join(" ") let (output, exitCode) = bashEx cmd echo output @@ -136,7 +136,7 @@ static: discard gorge "mkdir -p " & buildDir let cmd = "cd " & buildDir & " && cmake " & LeopardDir & " " & LeopardCmakeFlags & - " && make" + " && make libleopard" echo "\nBuilding Leopard-RS: " & cmd let (output, exitCode) = gorgeEx cmd echo output From ca638816131772c804df65a54a95896d9d1883d7 Mon Sep 17 00:00:00 2001 From: Mark Spanbroek Date: Mon, 14 Nov 2022 10:55:07 +0100 Subject: [PATCH 2/2] [ci] Fix CI on macOS --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3c13bd7..eb4d041 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -137,9 +137,9 @@ jobs: touch tests/testleopard fi if [[ ${{ matrix.platform.os }} = macos ]]; then - export PATH="$(brew --prefix)/opt/llvm/bin:${PATH}" - export LDFLAGS="-L$(brew --prefix)/opt/libomp/lib -L$(brew --prefix)/opt/llvm/lib -Wl,-rpath,$(brew --prefix)/opt/llvm/lib" - compiler_extra_options="-d:LeopardCmakeFlags='-DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$(brew --prefix)/opt/llvm/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix)/opt/llvm/bin/clang++' -d:LeopardExtraCompilerlags='-fopenmp' -d:LeopardExtraLinkerFlags='-fopenmp -L$(brew --prefix)/opt/libomp/lib'" + export PATH="$(brew --prefix llvm@14)/bin:${PATH}" + export LDFLAGS="-L$(brew --prefix libomp)/lib -L$(brew --prefix llvm@14)/lib -Wl,-rpath,$(brew --prefix llvm@14)/lib" + compiler_extra_options="-d:LeopardCmakeFlags='-DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=$(brew --prefix llvm@14)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm@14)/bin/clang++' -d:LeopardExtraCompilerlags='-fopenmp' -d:LeopardExtraLinkerFlags='-fopenmp -L$(brew --prefix libomp)/lib'" fi if [[ ${{ matrix.nim_version }} = 1.2.* ]]; then eval nimble --verbose test -d:release --gc:refc ${compiler_extra_options}