File tree Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Expand file tree Collapse file tree 3 files changed +6
-8
lines changed Original file line number Diff line number Diff line change 197197 {
198198 "name" : " x64-linux-gcc-ci" ,
199199 "inherits" : [
200- " x64-linux-gcc-12 "
200+ " x64-linux-gcc-14 "
201201 ]
202202 },
203203 {
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" : {
Original file line number Diff line number Diff line change 11set (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 )
55set (CMAKE_OSX_DEPLOYMENT_TARGET 14.2 CACHE STRING "OSX deployment target" )
66set (CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "OSX target architectures" )
77
88set (CMAKE_C_STANDARD 17)
99set (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" )
1311set (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)
44
55set (VCPKG_CMAKE_SYSTEM_NAME Darwin)
66set (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