File tree Expand file tree Collapse file tree 3 files changed +5
-7
lines changed Expand file tree Collapse file tree 3 files changed +5
-7
lines changed Original file line number Diff line number Diff line change 229
229
" base"
230
230
],
231
231
"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"
234
234
},
235
235
"vendor" : {
236
236
"microsoft.com/VisualStudioSettings/CMake/1.0" : {
Original file line number Diff line number Diff line change 1
1
set (CMAKE_SYSTEM_PROCESSOR AMD64)
2
2
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 )
5
5
set (CMAKE_OSX_DEPLOYMENT_TARGET 14.2 CACHE STRING "OSX deployment target" )
6
6
set (CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "OSX target architectures" )
7
7
8
8
set (CMAKE_C_STANDARD 17)
9
9
set (CMAKE_CXX_STANDARD 20)
10
10
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" )
13
11
set (CMAKE_CXX_SCAN_FOR_MODULES OFF )
Original file line number Diff line number Diff line change @@ -4,4 +4,4 @@ set(VCPKG_LIBRARY_LINKAGE static)
4
4
5
5
set (VCPKG_CMAKE_SYSTEM_NAME Darwin)
6
6
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" )
You can’t perform that action at this time.
0 commit comments