From 0f71a9291a7400844d95d7ae6aabeaa6b9191527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Wed, 12 Nov 2025 10:04:30 +0100 Subject: [PATCH] cmake: improve host system detection in some more cases --- CMakeLists.txt | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a758008f6..56c72b085c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -732,8 +732,15 @@ endforeach() include(CheckSymbolExists) string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS) -if(ZIG_HOST_TARGET_OS STREQUAL "darwin") +if(ZIG_HOST_TARGET_OS STREQUAL "android") + set(ZIG_HOST_TARGET_OS "linux") + set(ZIG_HOST_TARGET_IS_ANDROID TRUE) +elseif(ZIG_HOST_TARGET_OS STREQUAL "darwin") set(ZIG_HOST_TARGET_OS "macos") +elseif(ZIG_HOST_TARGET_OS STREQUAL "gnu") + set(ZIG_HOST_TARGET_OS "hurd") +elseif(ZIG_HOST_TARGET_OS STREQUAL "serenityos") + set(ZIG_HOST_TARGET_OS "serenity") elseif(ZIG_HOST_TARGET_OS STREQUAL "sunos") set(ZIG_HOST_TARGET_OS "illumos") endif() @@ -762,15 +769,17 @@ if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(eb)?$") endif() string(REGEX REPLACE "^ppc((64)?(le)?)$" "powerpc\\1" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}") +set(ZIG_HOST_TARGET_ABI "") if(MSVC) set(ZIG_HOST_TARGET_ABI "-msvc") elseif(MINGW) set(ZIG_HOST_TARGET_ABI "-gnu") -elseif(ZIG_HOST_TARGET_ARCH MATCHES "^(arm|thumb)hf?(eb)?$") - string(REGEX REPLACE "^(arm|thumb)hf?((eb)?)$" "\\1\\2" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}") - set(ZIG_HOST_TARGET_ABI "-eabihf") -else() - set(ZIG_HOST_TARGET_ABI "") +elseif(ZIG_HOST_TARGET_IS_ANDROID) + if(ZIG_HOST_TARGET_ARCH STREQUAL "arm") + set(ZIG_HOST_TARGET_ABI "androideabi") + else() + set(ZIG_HOST_TARGET_ABI "android") + endif() endif() set(ZIG_HOST_TARGET_TRIPLE "${ZIG_HOST_TARGET_ARCH}-${ZIG_HOST_TARGET_OS}${ZIG_HOST_TARGET_ABI}" CACHE STRING "Host zig target triple.")