From 0cb8ed6b85048db849b80f8e03b5f21ed48f91ad Mon Sep 17 00:00:00 2001 From: Michael Dusan Date: Mon, 2 Jan 2023 19:18:32 -0500 Subject: [PATCH] cmake: ignore case for TARGET ARCH/OS mapping - first convert to lower-case then perform mappings - effect: freebsd, netbsd and openbsd convert arch `amd64` to `x86_64` - effect: convert `arm64` to `aarch64` --- CMakeLists.txt | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 997bfd51f6..ece221632f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -708,21 +708,15 @@ target_link_libraries(zigcpp LINK_PUBLIC ${CMAKE_THREAD_LIBS_INIT} ) -if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64") +string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" HOST_TARGET_ARCH) +if(HOST_TARGET_ARCH STREQUAL "amd64") set(HOST_TARGET_ARCH "x86_64") -elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "amd64") - set(HOST_TARGET_ARCH "x86_64") -elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64") +elseif(HOST_TARGET_ARCH STREQUAL "arm64") set(HOST_TARGET_ARCH "aarch64") -elseif(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "ARM64") - set(HOST_TARGET_ARCH "aarch64") -else() - string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}" HOST_TARGET_ARCH) endif() -if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Darwin") +string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" HOST_TARGET_OS) +if(HOST_TARGET_OS STREQUAL "darwin") set(HOST_TARGET_OS "macos") -else() - string(TOLOWER "${CMAKE_HOST_SYSTEM_NAME}" HOST_TARGET_OS) endif() set(HOST_TARGET_TRIPLE "${HOST_TARGET_ARCH}-${HOST_TARGET_OS}")