1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable TRY_RUN when cross compiling

Browse Source 
Fixes: QTBUG-114625
Pick-to: 6.5.2 6.5 6.6
Change-Id: Idec5ea438ebf3f88d63da7d956ab52e2a0fa1821
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Amir Masoud Abdol 2023-06-16 08:51:52 +02:00
parent a452e22546
commit 331f316b91
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtToolHelpers.cmake
View File

@ -18,7 +18,7 @@
# TRY_RUN # TRY_RUN
# On Windows, it creates a helper batch script that tests whether the tool can be executed # On Windows, it creates a helper batch script that tests whether the tool can be executed
# successfully or not. If not, build halts and an error will be show, with tips on what # successfully or not. If not, build halts and an error will be show, with tips on what
# might be cause, and how to fix it. # might be cause, and how to fix it. TRY_RUN is disabled when cross-compiling.
# TRY_RUN_FLAGS # TRY_RUN_FLAGS
# Command line flags that are going to be passed to the tool for testing its correctness. # Command line flags that are going to be passed to the tool for testing its correctness.
# If no flags were given, we default to `-v`. # If no flags were given, we default to `-v`.
@ -233,7 +233,7 @@ function(qt_internal_add_tool target_name)
qt_internal_apply_staging_prefix_build_rpath_workaround() qt_internal_apply_staging_prefix_build_rpath_workaround()
endif() endif()
if(arg_TRY_RUN AND WIN32) if(arg_TRY_RUN AND WIN32 AND NOT CMAKE_CROSSCOMPILING)
if(NOT arg_TRY_RUN_FLAGS) if(NOT arg_TRY_RUN_FLAGS)
set(arg_TRY_RUN_FLAGS "-v") set(arg_TRY_RUN_FLAGS "-v")
endif() endif()