depends: consistently use host for triples

This commit is contained in:
tobtoht
2026-08-25 08:40:44 +02:00
parent 3646f648db
commit 46cb19853f
+3 -7
View File
@@ -72,19 +72,15 @@ endfunction()
# specify the cross compiler to be used. Darwin uses clang provided by the SDK. # specify the cross compiler to be used. Darwin uses clang provided by the SDK.
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
if(ARCHITECTURE STREQUAL "aarch64") if(ARCHITECTURE STREQUAL "aarch64")
SET(CLANG_TARGET "arm64-apple-darwin")
SET(CONF_TRIPLE "arm64-apple-darwin")
SET(BUILD_TAG "mac-armv8") SET(BUILD_TAG "mac-armv8")
SET(CMAKE_OSX_ARCHITECTURES "arm64") SET(CMAKE_OSX_ARCHITECTURES "arm64")
set(ARM ON) set(ARM ON)
set(ARM_ID "armv8-a") set(ARM_ID "armv8-a")
else() else()
SET(CLANG_TARGET "x86_64-apple-darwin")
SET(CONF_TRIPLE "x86_64-apple-darwin")
SET(BUILD_TAG "mac-x64") SET(BUILD_TAG "mac-x64")
SET(CMAKE_OSX_ARCHITECTURES "x86_64") SET(CMAKE_OSX_ARCHITECTURES "x86_64")
endif() 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) split_program("@CC@" CC_DARWIN CC_DARWIN_ARGS)
SET(CMAKE_C_COMPILER "${CC_DARWIN}" "${CC_DARWIN_ARGS}") SET(CMAKE_C_COMPILER "${CC_DARWIN}" "${CC_DARWIN_ARGS}")
split_program("@CXX@" CXX_DARWIN CXX_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_INSTALL_NAME_TOOL llvm-install-name-tool)
SET(CMAKE_ASM_COMPILER clang) SET(CMAKE_ASM_COMPILER clang)
SET(CMAKE_ASM-ATT_COMPILER llvm-as) SET(CMAKE_ASM-ATT_COMPILER llvm-as)
SET(CMAKE_ASM_COMPILER_TARGET ${CLANG_TARGET}) SET(CMAKE_ASM_COMPILER_TARGET @host@)
SET(CMAKE_ASM-ATT_COMPILER_TARGET ${CLANG_TARGET}) SET(CMAKE_ASM-ATT_COMPILER_TARGET @host@)
SET(APPLE True) SET(APPLE True)
SET(BUILD_64 ON) SET(BUILD_64 ON)
SET(BREW OFF) SET(BREW OFF)