Skip to content

Commit f090ca2

Browse files
committed
ci: instruct linker to use correct libc++
1 parent 62e3a80 commit f090ca2

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/weekly.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ jobs:
6565
else
6666
export EMBEDDED_BLOCKS_RUNTIME=ON
6767
fi
68+
if [ "${{ matrix.cxxlib }}" = "libc++" ]; then
69+
export ADDITIONAL_LINKER_FLAGS="-stdlib=libstdc++ -lc++abi
70+
fi
6871
ls -lahR /usr/lib/llvm-${LLVM_VERSION}/lib/
6972
cmake -B ${{github.workspace}}/build \
7073
-DCMAKE_BUILD_TYPE=${{matrix.build-type}} -G Ninja \
@@ -75,7 +78,8 @@ jobs:
7578
-DCMAKE_ASM_COMPILER=clang-${LLVM_VERSION} \
7679
-DCMAKE_CXX_COMPILER=clang++-${LLVM_VERSION} \
7780
-DCMAKE_OBJCXX_COMPILER=clang++-${LLVM_VERSION} \
78-
-DCMAKE_CXX_FLAGS="-stdlib=${{matrix.cxxlib}}"
81+
-DCMAKE_CXX_FLAGS="-stdlib=${{matrix.cxxlib}}" \
82+
-DCMAKE_EXE_LINKER_FLAGS="-stdlib=${{matrix.cxxlib}} $ADDITIONAL_LINKER_FLAGS"
7983
# Build with a nice ninja status line
8084
- name: Build
8185
working-directory: ${{github.workspace}}/build

0 commit comments

Comments
 (0)