From cb817c7d1a204194a5651a927f43d9434b265a7e Mon Sep 17 00:00:00 2001 From: Ilia Date: Sat, 11 Jul 2020 20:27:05 +0300 Subject: [PATCH] Fix build configs for macOS ARM64 on DTK (#39142) Related issue: #39010 --- eng/native/configurecompiler.cmake | 8 +++++++- eng/native/configureplatform.cmake | 8 +++++++- eng/native/init-os-and-arch.sh | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 1b43b0f..9d1b88f 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -226,7 +226,13 @@ if (CLR_CMAKE_HOST_UNIX) add_definitions(-DHOST_UNIX) if(CLR_CMAKE_HOST_OSX) - message("Detected OSX x86_64") + if(CLR_CMAKE_HOST_UNIX_AMD64) + message("Detected OSX x86_64") + elseif(CLR_CMAKE_HOST_UNIX_ARM64) + message("Detected OSX ARM64") + else() + clr_unknown_arch() + endif() elseif(CLR_CMAKE_HOST_FREEBSD) message("Detected FreeBSD amd64") elseif(CLR_CMAKE_HOST_NETBSD) diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index 8c4ddff..c652741 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -78,8 +78,14 @@ endif(CLR_CMAKE_HOST_OS STREQUAL Linux) if(CLR_CMAKE_HOST_OS STREQUAL Darwin) set(CLR_CMAKE_HOST_UNIX 1) - set(CLR_CMAKE_HOST_UNIX_AMD64 1) set(CLR_CMAKE_HOST_OSX 1) + if(CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64) + set(CLR_CMAKE_HOST_UNIX_AMD64 1) + elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL arm64) + set(CLR_CMAKE_HOST_UNIX_ARM64 1) + else() + clr_unknown_arch() + endif() set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} -o -c ") endif(CLR_CMAKE_HOST_OS STREQUAL Darwin) diff --git a/eng/native/init-os-and-arch.sh b/eng/native/init-os-and-arch.sh index 46c128d..0a60183 100644 --- a/eng/native/init-os-and-arch.sh +++ b/eng/native/init-os-and-arch.sh @@ -33,7 +33,7 @@ else fi case "$CPUName" in - aarch64) + arm64|aarch64) arch=arm64 ;; -- 2.7.4