Skip to content

Commit c58ecc7

Browse files
committed
Fixed macos workflow.
1 parent 5fdb942 commit c58ecc7

1 file changed

Lines changed: 8 additions & 11 deletions

File tree

.github/workflows/build_and_test.yml

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -91,31 +91,28 @@ jobs:
9191
steps:
9292
- uses: actions/checkout@v3
9393

94-
- run: brew install ninja boost cryptopp curl llvm@19
94+
- run: brew install ninja boost cryptopp curl llvm@19 lld@19
9595

9696
- name: Get Brew Prefix
9797
run: |
9898
echo "BREW_PREFIX=$(brew --prefix)" >> $GITHUB_ENV
9999
100-
- name: Set Env Vars
101-
run: |
102-
echo "export LDFLAGS=-L$BREW_PREFIX/lib" >> $GITHUB_ENV
103-
echo "export CPPFLAGS=-I$BREW_PREFIX/include" >> $GITHUB_ENV
104-
105100
- name: Configure CMake
106101
run: >
107102
cmake
108-
-DCMAKE_C_COMPILER=$BREW_PREFIX/opt/llvm@19/bin/clang
109-
-DCMAKE_CXX_COMPILER=$BREW_PREFIX/opt/llvm@19/bin/clang++
110-
-DCMAKE_LINKER=$BREW_PREFIX/opt/llvm@19/bin/lld
103+
-DCMAKE_C_COMPILER=${{env.BREW_PREFIX}}/opt/llvm@19/bin/clang
104+
-DCMAKE_CXX_COMPILER=${{env.BREW_PREFIX}}/opt/llvm@19/bin/clang++
105+
-DCMAKE_LINKER=${{env.BREW_PREFIX}}/opt/lld@19/bin/lld
106+
-DCMAKE_CXX_FLAGS="-stdlib=libc++ -nostdinc++ -I${{env.BREW_PREFIX}}/opt/llvm@19/include/c++/v1"
107+
-DCMAKE_EXE_LINKER_FLAGS="-L${{env.BREW_PREFIX}}/opt/llvm@19/lib/c++ -L${{env.BREW_PREFIX}}/opt/llvm@19/lib/unwind -lunwind -Wl,-rpath,${{env.BREW_PREFIX}}/opt/llvm@19/lib/c++"
111108
-DROAR_BUILD_TESTS=on
112109
-S ${{github.workspace}}
113110
-B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}}
114111
-G"Ninja"
115112
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
116-
-DBREW_PREFIX="$BREW_PREFIX"
113+
-DBREW_PREFIX="${{env.BREW_PREFIX}}"
117114
-DCMAKE_CXX_EXTENSIONS=on
118115
-DCMAKE_CXX_STANDARD=20
119116
120117
- name: Build
121-
run: cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}
118+
run: cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}

0 commit comments

Comments
 (0)