From 67489dad321c4b6d552fec721af76d7bac229018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20S=2E=20Ga=C3=9Fmann?= Date: Sat, 12 Jul 2025 21:11:59 +0000 Subject: [PATCH 1/2] build: try to avoid cross compiling mode on OSX --- tmpl/tools/toolchains/arm64-macos-clang-19-brew.cmake | 2 -- 1 file changed, 2 deletions(-) diff --git a/tmpl/tools/toolchains/arm64-macos-clang-19-brew.cmake b/tmpl/tools/toolchains/arm64-macos-clang-19-brew.cmake index 68587e6..cb4d817 100644 --- a/tmpl/tools/toolchains/arm64-macos-clang-19-brew.cmake +++ b/tmpl/tools/toolchains/arm64-macos-clang-19-brew.cmake @@ -1,5 +1,3 @@ -set(CMAKE_SYSTEM_PROCESSOR arm64) - execute_process(COMMAND brew --prefix llvm@19 OUTPUT_VARIABLE BREW_LLVM_PATH OUTPUT_STRIP_TRAILING_WHITESPACE) set(CMAKE_C_COMPILER "${BREW_LLVM_PATH}/bin/clang") From ff33a2ec12c3b0f14224c4b18544fbf54fc9bf71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20S=2E=20Ga=C3=9Fmann?= Date: Sat, 12 Jul 2025 21:21:41 +0000 Subject: [PATCH 2/2] ci: use GCC-14 for macOS to workaround TLS ld bug --- tmpl/CMakePresets.json | 4 ++-- .../{x64-macos-gcc-12.cmake => x64-macos-gcc-14.cmake} | 6 ++---- .../{x64-osx-gcc-12.cmake => x64-macos-gcc-14.cmake} | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) rename tmpl/tools/toolchains/{x64-macos-gcc-12.cmake => x64-macos-gcc-14.cmake} (59%) rename tmpl/tools/triplets/{x64-osx-gcc-12.cmake => x64-macos-gcc-14.cmake} (86%) diff --git a/tmpl/CMakePresets.json b/tmpl/CMakePresets.json index 4868136..992892d 100644 --- a/tmpl/CMakePresets.json +++ b/tmpl/CMakePresets.json @@ -229,8 +229,8 @@ "base" ], "cacheVariables": { - "VCPKG_TARGET_TRIPLET": "x64-osx-gcc-12", - "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-macos-gcc-12.cmake" + "VCPKG_TARGET_TRIPLET": "x64-macos-gcc-14", + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/tools/toolchains/x64-macos-gcc-14.cmake" }, "vendor": { "microsoft.com/VisualStudioSettings/CMake/1.0": { diff --git a/tmpl/tools/toolchains/x64-macos-gcc-12.cmake b/tmpl/tools/toolchains/x64-macos-gcc-14.cmake similarity index 59% rename from tmpl/tools/toolchains/x64-macos-gcc-12.cmake rename to tmpl/tools/toolchains/x64-macos-gcc-14.cmake index 9a2f9dc..aede960 100644 --- a/tmpl/tools/toolchains/x64-macos-gcc-12.cmake +++ b/tmpl/tools/toolchains/x64-macos-gcc-14.cmake @@ -1,13 +1,11 @@ set(CMAKE_SYSTEM_PROCESSOR AMD64) -set(CMAKE_C_COMPILER gcc-12) -set(CMAKE_CXX_COMPILER g++-12) +set(CMAKE_C_COMPILER gcc-14) +set(CMAKE_CXX_COMPILER g++-14) set(CMAKE_OSX_DEPLOYMENT_TARGET 14.2 CACHE STRING "OSX deployment target") set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING "OSX target architectures") set(CMAKE_C_STANDARD 17) set(CMAKE_CXX_STANDARD 20) -# the new linker currently segfaults with gcc (I believe this is fixed with gcc 14) -set(CMAKE_CXX_FLAGS_INIT "-Wl,-ld_classic") set(CMAKE_CXX_SCAN_FOR_MODULES OFF) diff --git a/tmpl/tools/triplets/x64-osx-gcc-12.cmake b/tmpl/tools/triplets/x64-macos-gcc-14.cmake similarity index 86% rename from tmpl/tools/triplets/x64-osx-gcc-12.cmake rename to tmpl/tools/triplets/x64-macos-gcc-14.cmake index 6658f7c..10a6827 100644 --- a/tmpl/tools/triplets/x64-osx-gcc-12.cmake +++ b/tmpl/tools/triplets/x64-macos-gcc-14.cmake @@ -4,4 +4,4 @@ set(VCPKG_LIBRARY_LINKAGE static) set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_OSX_ARCHITECTURES x86_64) -set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-macos-gcc-12.cmake") +set(VCPKG_CHAINLOAD_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/../toolchains/x64-macos-gcc-14.cmake")