Skip to content

Commit

Permalink
build: Update to Xcode 15.2 due to gcc incompats
Browse files Browse the repository at this point in the history
  • Loading branch information
BurningEnlightenment committed Feb 17, 2024
1 parent 4bc69f6 commit 3c0d335
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/cpp-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ jobs:
include:
- os: macos-13
triplet: x64-macos
install: |
brew upgrade gcc@12
- os: ubuntu-22.04
triplet: x64-linux
- os: ubuntu-22.04
Expand Down
2 changes: 1 addition & 1 deletion tools/toolchains/x64-macos-clang-16-brew.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ execute_process(COMMAND brew --prefix llvm@16 OUTPUT_VARIABLE BREW_LLVM_PATH OUT

set(CMAKE_C_COMPILER "${BREW_LLVM_PATH}/bin/clang")
set(CMAKE_CXX_COMPILER "${BREW_LLVM_PATH}/bin/clang++")
set(CMAKE_OSX_SYSROOT /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
set(CMAKE_OSX_SYSROOT /Applications/Xcode_15.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)

set(CMAKE_C_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)
Expand Down
2 changes: 1 addition & 1 deletion tools/toolchains/x64-macos-gcc-12.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_PROCESSOR AMD64)

set(CMAKE_C_COMPILER gcc-12)
set(CMAKE_CXX_COMPILER g++-12)
set(CMAKE_OSX_SYSROOT /Applications/Xcode_15.0.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
set(CMAKE_OSX_SYSROOT /Applications/Xcode_15.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)

set(CMAKE_C_STANDARD 17)
set(CMAKE_CXX_STANDARD 20)

0 comments on commit 3c0d335

Please sign in to comment.