Skip to content

fix: workaround some minor macos issues #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: workaround some minor macos issues #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67489da
build: try to avoid cross compiling mode on OSX
BurningEnlightenment Jul 12, 2025
ff33a2e
ci: use GCC-14 for macOS to workaround TLS ld bug
BurningEnlightenment Jul 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tmpl/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 0 additions & 2 deletions tmpl/tools/toolchains/arm64-macos-clang-19-brew.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
6 changes: 2 additions & 4 deletions tmpl/tools/toolchains/x64-macos-gcc-12.cmake → tmpl/tools/toolchains/x64-macos-gcc-14.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion tmpl/tools/triplets/x64-osx-gcc-12.cmake → tmpl/tools/triplets/x64-macos-gcc-14.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")