From 1d909d09f4bc52ee0f4c8fa13b3e8a2cc6ad3803 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Wed, 12 Aug 2026 11:38:13 +0200 Subject: [PATCH] depends: set CMAKE_{LANG}_COMPILER_TARGET --- contrib/depends/Makefile | 2 +- contrib/depends/toolchain.cmake.in | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contrib/depends/Makefile b/contrib/depends/Makefile index ef7d809c8..fce2dcb66 100644 --- a/contrib/depends/Makefile +++ b/contrib/depends/Makefile @@ -145,7 +145,7 @@ $(host_prefix)/.stamp_$(final_build_id): $(native_packages) $(packages) $(host_prefix)/share/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(final_build_id) $(AT)@mkdir -p $(@D) - $(AT)sed -e 's|@HOST@|$(host)|' \ + $(AT)sed -e 's|@host@|$(host)|' \ -e 's|@CC@|$(host_CC)|' \ -e 's|@CXX@|$(host_CXX)|' \ -e 's|@AR@|$(toolchain_path)$(host_AR)|' \ diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index d29356529..9d3ca7862 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -3,6 +3,9 @@ SET(CMAKE_SYSTEM_NAME @cmake_system_name@) SET(CMAKE_SYSTEM_PROCESSOR @arch@) SET(CMAKE_BUILD_TYPE @release_type@) +SET(CMAKE_C_COMPILER_TARGET @host@) +SET(CMAKE_CXX_COMPILER_TARGET @host@) + SET(STATIC ON) SET(UNBOUND_STATIC ON) SET(ARCH "default") @@ -84,11 +87,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") SET(_CMAKE_TOOLCHAIN_PREFIX @prefix@/native/bin/${CONF_TRIPLE}-) split_program("@CC@" CC_DARWIN CC_DARWIN_ARGS) SET(CMAKE_C_COMPILER "${CC_DARWIN}" "${CC_DARWIN_ARGS}") - SET(CMAKE_C_COMPILER_TARGET ${CLANG_TARGET}) split_program("@CXX@" CXX_DARWIN CXX_DARWIN_ARGS) SET(CMAKE_CXX_COMPILER "${CXX_DARWIN}" "${CXX_DARWIN_ARGS}") SET(CMAKE_C_FLAGS "@CFLAGS@") - SET(CMAKE_CXX_COMPILER_TARGET ${CLANG_TARGET}) SET(CMAKE_CXX_FLAGS "@CXXFLAGS@") SET(CMAKE_EXE_LINKER_FLAGS "@LDFLAGS@") SET(CMAKE_MODULE_LINKER_FLAGS "@LDFLAGS@") @@ -108,6 +109,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") elseif(TARGET_OS STREQUAL "android") SET(ANDROID TRUE) + UNSET(CMAKE_C_COMPILER_TARGET) + UNSET(CMAKE_CXX_COMPILER_TARGET) + split_program("@CC@" CC_ANDROID CC_ANDROID_ARGS) SET(CMAKE_C_COMPILER "${CC_ANDROID}" "${CC_ANDROID_ARGS}")