diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 9d3ca7862..aaa411892 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -72,19 +72,15 @@ endfunction() # specify the cross compiler to be used. Darwin uses clang provided by the SDK. if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(ARCHITECTURE STREQUAL "aarch64") - SET(CLANG_TARGET "arm64-apple-darwin") - SET(CONF_TRIPLE "arm64-apple-darwin") SET(BUILD_TAG "mac-armv8") SET(CMAKE_OSX_ARCHITECTURES "arm64") set(ARM ON) set(ARM_ID "armv8-a") else() - SET(CLANG_TARGET "x86_64-apple-darwin") - SET(CONF_TRIPLE "x86_64-apple-darwin") SET(BUILD_TAG "mac-x64") SET(CMAKE_OSX_ARCHITECTURES "x86_64") endif() - SET(_CMAKE_TOOLCHAIN_PREFIX @prefix@/native/bin/${CONF_TRIPLE}-) + SET(_CMAKE_TOOLCHAIN_PREFIX @prefix@/native/bin/@host@-) split_program("@CC@" CC_DARWIN CC_DARWIN_ARGS) SET(CMAKE_C_COMPILER "${CC_DARWIN}" "${CC_DARWIN_ARGS}") split_program("@CXX@" CXX_DARWIN CXX_DARWIN_ARGS) @@ -97,8 +93,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(CMAKE_INSTALL_NAME_TOOL llvm-install-name-tool) SET(CMAKE_ASM_COMPILER clang) SET(CMAKE_ASM-ATT_COMPILER llvm-as) - SET(CMAKE_ASM_COMPILER_TARGET ${CLANG_TARGET}) - SET(CMAKE_ASM-ATT_COMPILER_TARGET ${CLANG_TARGET}) + SET(CMAKE_ASM_COMPILER_TARGET @host@) + SET(CMAKE_ASM-ATT_COMPILER_TARGET @host@) SET(APPLE True) SET(BUILD_64 ON) SET(BREW OFF)