Skip to content

Commit ff33a2e

Browse files
ci: use GCC-14 for macOS to workaround TLS ld bug
1 parent 67489da commit ff33a2e

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

tmpl/CMakePresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@
229229
"base"
230230
],
231231
"cacheVariables": {
232-
"VCPKG_TARGET_TRIPLET": "x64-osx-gcc-12",
233-
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-macos-gcc-12.cmake"
232+
"VCPKG_TARGET_TRIPLET": "x64-macos-gcc-14",
233+
"VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-macos-gcc-14.cmake"
234234
},
235235
"vendor": {
236236
"microsoft.com/VisualStudioSettings/CMake/1.0": {
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
set(CMAKE_SYSTEM_PROCESSOR AMD64)
22

3-
set(CMAKE_C_COMPILER gcc-12)
4-
set(CMAKE_CXX_COMPILER g++-12)
3+
set(CMAKE_C_COMPILER gcc-14)
4+
set(CMAKE_CXX_COMPILER g++-14)
55
set(CMAKE_OSX_DEPLOYMENT_TARGET 14.2 CACHE STRING "OSX deployment target")
66
set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "OSX target architectures")
77

88
set(CMAKE_C_STANDARD 17)
99
set(CMAKE_CXX_STANDARD 20)
1010

11-
# the new linker currently segfaults with gcc (I believe this is fixed with gcc 14)
12-
set(CMAKE_CXX_FLAGS_INIT "-Wl,-ld_classic")
1311
set(CMAKE_CXX_SCAN_FOR_MODULES OFF)

tmpl/tools/triplets/x64-osx-gcc-12.cmake renamed to tmpl/tools/triplets/x64-macos-gcc-14.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set(VCPKG_LIBRARY_LINKAGE static)
44

55
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
66
set(VCPKG_OSX_ARCHITECTURES x86_64)
7-
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-macos-gcc-12.cmake")
7+
set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-macos-gcc-14.cmake")

0 commit comments

Comments
 (0)