[FIXUP] cmake: Do not trigger cross-compiling unnecessarily

hebasto · May 20, 2024 · a856151 · a856151
1 parent fb593cd
commit a856151
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 38 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -556,22 +556,20 @@ else()
   )
 endif()
 
-if(CMAKE_CROSSCOMPILING)
-  target_compile_definitions(core_base_interface INTERFACE ${DEPENDS_COMPILE_DEFINITIONS})
-  target_compile_definitions(core_depends_release_interface INTERFACE ${DEPENDS_COMPILE_DEFINITIONS_RELWITHDEBINFO})
-  target_compile_definitions(core_depends_debug_interface INTERFACE ${DEPENDS_COMPILE_DEFINITIONS_DEBUG})
-
-  # If {C,CXX}FLAGS variables are defined during building depends and
-  # configuring this build system, their content might be duplicated.
-  if(DEFINED ENV{CFLAGS})
-    deduplicate_flags(CMAKE_C_FLAGS)
-  endif()
-  if(DEFINED ENV{CXXFLAGS})
-    deduplicate_flags(CMAKE_CXX_FLAGS)
-  endif()
-  if(DEFINED ENV{LDFLAGS})
-    deduplicate_flags(CMAKE_EXE_LINKER_FLAGS)
-  endif()
+target_compile_definitions(core_base_interface INTERFACE ${DEPENDS_COMPILE_DEFINITIONS})
+target_compile_definitions(core_depends_release_interface INTERFACE ${DEPENDS_COMPILE_DEFINITIONS_RELWITHDEBINFO})
+target_compile_definitions(core_depends_debug_interface INTERFACE ${DEPENDS_COMPILE_DEFINITIONS_DEBUG})
+
+# If {C,CXX,LD}FLAGS variables are defined during building depends and
+# configuring this build system, their content might be duplicated.
+if(DEFINED ENV{CFLAGS})
+  deduplicate_flags(CMAKE_C_FLAGS)
+endif()
+if(DEFINED ENV{CXXFLAGS})
+  deduplicate_flags(CMAKE_CXX_FLAGS)
+endif()
+if(DEFINED ENV{LDFLAGS})
+  deduplicate_flags(CMAKE_EXE_LINKER_FLAGS)
 endif()
 
 add_subdirectory(src)

diff --git a/cmake/module/Maintenance.cmake b/cmake/module/Maintenance.cmake
@@ -30,11 +30,15 @@ function(add_maintenance_targets)
   else()
     set(exe_format ELF)
   endif()
-  if(CMAKE_CROSSCOMPILING)
-    list(JOIN DEPENDS_C_COMPILER_WITH_LAUNCHER " " c_compiler_command)
-  else()
-    set(c_compiler_command ${CMAKE_C_COMPILER})
-  endif()
+
+  # In CMake, the components of the compiler invocation are separated into three distinct variables:
+  #  - CMAKE_C_COMPILER_LAUNCHER: a semicolon-separated list of launchers or tools to precede the compiler (e.g., env or ccache).
+  #  - CMAKE_C_COMPILER: the full path to the compiler binary itself (e.g., /usr/bin/clang).
+  #  - CMAKE_C_COMPILER_ARG1: a string containing initial compiler options (e.g., --target=x86_64-apple-darwin -nostdlibinc).
+  # By concatenating these variables, we form the complete command line to be passed to a Python script via the CC environment variable.
+  list(JOIN CMAKE_C_COMPILER_LAUNCHER " " c_compiler_command)
+  string(STRIP "${c_compiler_command} ${CMAKE_C_COMPILER}" c_compiler_command)
+  string(STRIP "${c_compiler_command} ${CMAKE_C_COMPILER_ARG1}" c_compiler_command)
   add_custom_target(test-security-check
     COMMAND ${CMAKE_COMMAND} -E env CC=${c_compiler_command} CFLAGS=${CMAKE_C_FLAGS} LDFLAGS=${CMAKE_EXE_LINKER_FLAGS} ${PYTHON_COMMAND} ${CMAKE_SOURCE_DIR}/contrib/devtools/test-security-check.py TestSecurityChecks.test_${exe_format}
     COMMAND ${CMAKE_COMMAND} -E env CC=${c_compiler_command} CFLAGS=${CMAKE_C_FLAGS} LDFLAGS=${CMAKE_EXE_LINKER_FLAGS} ${PYTHON_COMMAND} ${CMAKE_SOURCE_DIR}/contrib/devtools/test-symbol-check.py TestSymbolChecks.test_${exe_format}
@@ -111,7 +115,20 @@ function(add_macos_deploy_target)
     )
 
     string(REPLACE " " "-" osx_volname ${PACKAGE_NAME})
-    if(CMAKE_CROSSCOMPILING)
+    if(CMAKE_HOST_APPLE)
+      add_custom_command(
+        OUTPUT ${CMAKE_BINARY_DIR}/${osx_volname}.zip
+        COMMAND ${PYTHON_COMMAND} ${CMAKE_SOURCE_DIR}/contrib/macdeploy/macdeployqtplus ${macos_app} ${osx_volname} -translations-dir=${QT_TRANSLATIONS_DIR} -zip
+        DEPENDS ${CMAKE_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt
+        VERBATIM
+      )
+      add_custom_target(deploydir
+        DEPENDS ${CMAKE_BINARY_DIR}/${osx_volname}.zip
+      )
+      add_custom_target(deploy
+        DEPENDS ${CMAKE_BINARY_DIR}/${osx_volname}.zip
+      )
+    else()
       add_custom_command(
         OUTPUT ${CMAKE_BINARY_DIR}/dist/${macos_app}/Contents/MacOS/Bitcoin-Qt
         COMMAND OTOOL=${OTOOL} ${PYTHON_COMMAND} ${CMAKE_SOURCE_DIR}/contrib/macdeploy/macdeployqtplus ${macos_app} ${osx_volname} -translations-dir=${QT_TRANSLATIONS_DIR}
@@ -133,19 +150,6 @@ function(add_macos_deploy_target)
         DEPENDS ${CMAKE_BINARY_DIR}/dist/${osx_volname}.zip
       )
       add_dependencies(deploy deploydir)
-    else()
-      add_custom_command(
-        OUTPUT ${CMAKE_BINARY_DIR}/${osx_volname}.zip
-        COMMAND ${PYTHON_COMMAND} ${CMAKE_SOURCE_DIR}/contrib/macdeploy/macdeployqtplus ${macos_app} ${osx_volname} -translations-dir=${QT_TRANSLATIONS_DIR} -zip
-        DEPENDS ${CMAKE_BINARY_DIR}/${macos_app}/Contents/MacOS/Bitcoin-Qt
-        VERBATIM
-      )
-      add_custom_target(deploydir
-        DEPENDS ${CMAKE_BINARY_DIR}/${osx_volname}.zip
-      )
-      add_custom_target(deploy
-        DEPENDS ${CMAKE_BINARY_DIR}/${osx_volname}.zip
-      )
     endif()
   endif()
 endfunction()
diff --git a/depends/Makefile b/depends/Makefile
@@ -258,9 +258,16 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
             $< > $@
 	touch $@
 
+ifeq ($(host),$(build))
+  crosscompiling=FALSE
+else
+  crosscompiling=TRUE
+endif
+
 $(host_prefix)/toolchain.cmake : toolchain.cmake.in $(host_prefix)/.stamp_$(final_build_id)
 	@mkdir -p $(@D)
-	sed -e 's|@host_system@|$($(host_os)_cmake_system)|' \
+	sed -e 's|@depends_crosscompiling@|$(crosscompiling)|' \
+            -e 's|@host_system@|$($(host_os)_cmake_system)|' \
             -e 's|@host_arch@|$(host_arch)|' \
             -e 's|@CC@|$(host_CC)|' \
             -e 's|@CXX@|$(host_CXX)|' \

diff --git a/depends/toolchain.cmake.in b/depends/toolchain.cmake.in
@@ -4,8 +4,15 @@
 
 # This file is expected to be highly volatile and may still change substantially.
 
-set(CMAKE_SYSTEM_NAME @host_system@)
-set(CMAKE_SYSTEM_PROCESSOR @host_arch@)
+# If CMAKE_SYSTEM_NAME is set within a toolchain file, CMake will also
+# set CMAKE_CROSSCOMPILING to TRUE, even if CMAKE_SYSTEM_NAME matches
+# CMAKE_HOST_SYSTEM_NAME. To avoid potential misconfiguration of CMake,
+# it is best not to touch CMAKE_SYSTEM_NAME unless cross-compiling is
+# intended.
+if(@depends_crosscompiling@)
+  set(CMAKE_SYSTEM_NAME @host_system@)
+  set(CMAKE_SYSTEM_PROCESSOR @host_arch@)
+endif()
 
 function(split_compiler_launcher env_compiler launcher compiler)
   set(${launcher})