github-wownero/wownero
1
0
Fork 0
mirror of https://github.com/wownero/wownero.git synced 2026-10-17 07:31:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11094

Browse Source 
1d909d0 depends: set CMAKE_{LANG}_COMPILER_TARGET (tobtoht)

ACKs: selsta, redsh4de, jpk68
This commit is contained in:
tobtoht
2026-08-12 13:56:36 +00:00
parent 835fde157b 1d909d09f4
commit 13a877fad6
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/depends/Makefile
+1 -1
View File
@@ -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)|' \
contrib/depends/toolchain.cmake.in
+6 -2
View File
@@ -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}")