Skip to content

Commit

Permalink
GitHub Actions: bump macOS clang to 18
Browse files Browse the repository at this point in the history
  • Loading branch information
superg committed May 25, 2024
1 parent 67e9fc4 commit 13dbe94
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# ignore brew link warning, revert after https://github.com/actions/setup-python/issues/577 is fixed
run: |
brew update
brew install llvm@17 || true
brew install llvm@18 || true
brew install ninja
brew install cmake
Expand All @@ -63,9 +63,9 @@ jobs:
- name: CMake Configure (macos64)
if: ${{ matrix.os == 'macos-12' }}
env:
CC: /usr/local/opt/llvm@17/bin/clang
CXX: /usr/local/opt/llvm@17/bin/clang++
run: cmake -B ${{env.build_directory}} -G "Ninja" -DCMAKE_BUILD_TYPE=${{env.build_type}} -DREDUMPER_VERSION_BUILD=${{github.run_number}} -DREDUMPER_CLANG_LINK_OPTIONS="-L/usr/local/opt/llvm@17/lib/c++"
CC: /usr/local/opt/llvm@18/bin/clang
CXX: /usr/local/opt/llvm@18/bin/clang++
run: cmake -B ${{env.build_directory}} -G "Ninja" -DCMAKE_BUILD_TYPE=${{env.build_type}} -DREDUMPER_VERSION_BUILD=${{github.run_number}} -DREDUMPER_CLANG_LINK_OPTIONS="-L/usr/local/opt/llvm@18/lib/c++"

- name: CMake Build
run: cmake --build ${{env.build_directory}} --config ${{env.build_type}}
Expand Down
9 changes: 0 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,17 +66,8 @@ add_definitions(-DREDUMPER_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
-DREDUMPER_VERSION_BUILD=${REDUMPER_VERSION_BUILD})

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# -fexperimental-library is required for clang-16 as std::format is defined there
add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-stdlib=libc++>)
add_link_options(-stdlib=libc++ ${REDUMPER_CLANG_LINK_OPTIONS})

# silence implicit modules use warning
# TL;DR, this will be taken cared of by listing module dependencies explicitly (cmake)
# more information:
# https://github.com/llvm/llvm-project/issues/62707
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 17)
add_compile_options(-Wno-read-modules-implicitly)
endif()
elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
add_compile_options(-Wall -Wextra -Werror)

Expand Down

0 comments on commit 13dbe94

Please sign in to comment.