From 687ea31ef9c086db12421e3d4dd364fa040c8ea6 Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Mon, 5 Dec 2022 01:52:24 -0500 Subject: [PATCH] cmake: fix host target detection --- CMakeLists.txt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31903cb4ff..7d2e9d89e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -723,7 +723,20 @@ else() set(ZIG2_LINK_FLAGS "-Wl,-z,stack-size=0x10000000") endif() -string(TOLOWER "${CMAKE_HOST_SYSTEM_PROCESSOR}-${CMAKE_HOST_SYSTEM_NAME}" HOST_TARGET_TRIPLE) +if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "AMD64") + set(HOST_TARGET_ARCH "x86_64") +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") + 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}") + set(ZIG1_WASM_SOURCE "${CMAKE_SOURCE_DIR}/stage1/zig1.wasm.zst") set(ZIG1_C_SOURCE "${CMAKE_BINARY_DIR}/zig1.c") set(ZIG2_C_SOURCE "${CMAKE_BINARY_DIR}/zig2.c")