From 51fa7ef1c43c2b159cfba15ee06cd6f3fab3e556 Mon Sep 17 00:00:00 2001 From: Stephen Gregoratto Date: Sat, 30 Sep 2023 19:33:37 +1000 Subject: [PATCH] solaris: set correct target tuple in CMake --- CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8bb6825f2..b57bc8ea23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -705,9 +705,20 @@ target_link_libraries(zigcpp LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ) +string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS) +if(ZIG_HOST_TARGET_OS STREQUAL "darwin") + set(ZIG_HOST_TARGET_OS "macos") +elseif(ZIG_HOST_TARGET_OS STREQUAL "sunos") + set(ZIG_HOST_TARGET_OS "solaris") +endif() + string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" ZIG_HOST_TARGET_ARCH) if(ZIG_HOST_TARGET_ARCH MATCHES "^i[3-9]86$") - set(ZIG_HOST_TARGET_ARCH "x86") + if (ZIG_HOST_TARGET_OS STREQUAL "solaris") + set(ZIG_HOST_TARGET_ARCH "x86_64") + else() + set(ZIG_HOST_TARGET_ARCH "x86") + endif() elseif(ZIG_HOST_TARGET_ARCH STREQUAL "amd64") set(ZIG_HOST_TARGET_ARCH "x86_64") elseif(ZIG_HOST_TARGET_ARCH STREQUAL "arm64") @@ -727,11 +738,6 @@ if(ZIG_HOST_TARGET_ARCH MATCHES "^arm(hf?)?(eb)?$") endif() string(REGEX REPLACE "^ppc((64)?(le)?)$" "powerpc\\1" ZIG_HOST_TARGET_ARCH "${ZIG_HOST_TARGET_ARCH}") -string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" ZIG_HOST_TARGET_OS) -if(ZIG_HOST_TARGET_OS STREQUAL "darwin") - set(ZIG_HOST_TARGET_OS "macos") -endif() - if(MSVC) set(ZIG_HOST_TARGET_ABI "-msvc") elseif(MINGW)