authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-11-12 10:04:30+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-11-12 10:04:30+01:00
log0f71a9291a7400844d95d7ae6aabeaa6b9191527
tree020635149f7f1ff1af67fc2419b3f646dc5a10e4
parentcbfa87cbea0274e1e88d6a61bba82a2099e19fd6
signaturebadge-check Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

cmake: improve host system detection in some more cases

1 files changed, 15 insertions(+), 6 deletions(-)

CMakeLists.txt+15-6
...@@ -732,8 +732,15 @@ endforeach()...@@ -732,8 +732,15 @@ endforeach()
732include(CheckSymbolExists)732include(CheckSymbolExists)
733733
734string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS)734string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS)
735if(ZIG_HOST_TARGET_OS STREQUAL "darwin")735if(ZIG_HOST_TARGET_OS STREQUAL "android")
736 set(ZIG_HOST_TARGET_OS "linux")
737 set(ZIG_HOST_TARGET_IS_ANDROID TRUE)
738elseif(ZIG_HOST_TARGET_OS STREQUAL "darwin")
736 set(ZIG_HOST_TARGET_OS "macos")739 set(ZIG_HOST_TARGET_OS "macos")
740elseif(ZIG_HOST_TARGET_OS STREQUAL "gnu")
741 set(ZIG_HOST_TARGET_OS "hurd")
742elseif(ZIG_HOST_TARGET_OS STREQUAL "serenityos")
743 set(ZIG_HOST_TARGET_OS "serenity")
737elseif(ZIG_HOST_TARGET_OS STREQUAL "sunos")744elseif(ZIG_HOST_TARGET_OS STREQUAL "sunos")
738 set(ZIG_HOST_TARGET_OS "illumos")745 set(ZIG_HOST_TARGET_OS "illumos")
739endif()746endif()
...@@ -762,15 +769,17 @@ if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(eb)?$")...@@ -762,15 +769,17 @@ if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(eb)?$")
762endif()769endif()
763string(REGEX REPLACE "^ppc((64)?(le)?)$" "powerpc\\1" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")770string(REGEX REPLACE "^ppc((64)?(le)?)$" "powerpc\\1" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")
764771
772set(ZIG_HOST_TARGET_ABI "")
765if(MSVC)773if(MSVC)
766 set(ZIG_HOST_TARGET_ABI "-msvc")774 set(ZIG_HOST_TARGET_ABI "-msvc")
767elseif(MINGW)775elseif(MINGW)
768 set(ZIG_HOST_TARGET_ABI "-gnu")776 set(ZIG_HOST_TARGET_ABI "-gnu")
769elseif(ZIG_HOST_TARGET_ARCH MATCHES "^(arm|thumb)hf?(eb)?$")777elseif(ZIG_HOST_TARGET_IS_ANDROID)
770 string(REGEX REPLACE "^(arm|thumb)hf?((eb)?)$" "\\1\\2" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}")778 if(ZIG_HOST_TARGET_ARCH STREQUAL "arm")
771 set(ZIG_HOST_TARGET_ABI "-eabihf")779 set(ZIG_HOST_TARGET_ABI "androideabi")
772else()780 else()
773 set(ZIG_HOST_TARGET_ABI "")781 set(ZIG_HOST_TARGET_ABI "android")
782 endif()
774endif()783endif()
775784
776set(ZIG_HOST_TARGET_TRIPLE "${ZIG_HOST_TARGET_ARCH}-${ZIG_HOST_TARGET_OS}${ZIG_HOST_TARGET_ABI}" CACHE STRING "Host zig target triple.")785set(ZIG_HOST_TARGET_TRIPLE "${ZIG_HOST_TARGET_ARCH}-${ZIG_HOST_TARGET_OS}${ZIG_HOST_TARGET_ABI}" CACHE STRING "Host zig target triple.")