Fix separate_debug_info configure test for cross-compilation

The separate_debug_info configure test uses the CMake variable CMAKE_OBJCOPY. CMakeFindBinUtils in the test project finds the host's objcopy despite CMAKE_TOOLCHAIN_FILE being correctly set. We now add CMAKE_OBJCOPY to the list of variables that are passed to configure test projects and remove the CMakeFindBinUtils include, which looks rather internal anyways. Pick-to: 6.2 Fixes: QTBUG-96798 Change-Id: I164c6bd1771e8789e9dd19b50573b33b8866bd3b Reviewed-by: Alexandru Croitor <[email protected]>
qzhsjz · Sep 28, 2021 · 5ef0e34 · 5ef0e34
1 parent 66a44f4
commit 5ef0e34
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake
@@ -958,6 +958,7 @@ function(qt_get_platform_try_compile_vars out_var)
     list(APPEND flags "CMAKE_CXX_FLAGS_DEBUG")
     list(APPEND flags "CMAKE_CXX_FLAGS_RELEASE")
     list(APPEND flags "CMAKE_CXX_FLAGS_RELWITHDEBINFO")
+    list(APPEND flags "CMAKE_OBJCOPY")
 
     # Pass toolchain files.
     if(CMAKE_TOOLCHAIN_FILE)

diff --git a/config.tests/separate_debug_info/CMakeLists.txt b/config.tests/separate_debug_info/CMakeLists.txt
@@ -1,7 +1,6 @@
 # special case skip regeneration
 cmake_minimum_required(VERSION 3.16)
 project(objcopytest LANGUAGES CXX)
-include(CMakeFindBinUtils)
 add_executable(objcopytest main.cpp)
 add_custom_command(
     TARGET objcopytest