Skip to content

Commit ddf0f86

Browse files
committed
One last try for macos-14 LLVM
1 parent a6b0ecd commit ddf0f86

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

.github/workflows/test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ jobs:
3535
run: |
3636
brew install llvm@20
3737
brew link --force --overwrite llvm@20
38-
echo "CC=$(brew --prefix llvm@20)/bin/clang" >> $GITHUB_ENV
39-
echo "CXX=$(brew --prefix llvm@20)/bin/clang++" >> $GITHUB_ENV
38+
LLVM_PREFIX=$(brew --prefix llvm@20)
39+
echo "CC=$LLVM_PREFIX/bin/clang" >> $GITHUB_ENV
40+
echo "CXX=$LLVM_PREFIX/bin/clang++" >> $GITHUB_ENV
41+
echo "LDFLAGS=-L$LLVM_PREFIX/lib/c++ -Wl,-rpath,$LLVM_PREFIX/lib/c++" >> $GITHUB_ENV
4042
if: ${{ matrix.compiler == 'llvm-20' && (matrix.os == 'macos-14' || matrix.os == 'macos-15') }}
4143

4244
- name: Install LLVM and Clang (Ubuntu)

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@ if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
4444
target_compile_options(c++spec INTERFACE -Wno-missing-template-arg-list-after-template-kw -Wno-dollar-in-identifier-extension)
4545
endif()
4646

47-
if(APPLE)
48-
target_compile_definitions(c++spec INTERFACE _LIBCPP_DISABLE_AVAILABILITY_ANNOTATIONS=1)
49-
endif()
50-
5147
FILE(GLOB_RECURSE c++spec_headers ${CMAKE_CURRENT_LIST_DIR}/include/*.hpp)
5248

5349
option(CPPSPEC_PRECOMPILE_HEADERS "Precompile the C++Spec headers")

0 commit comments

Comments
 (0)