summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2022-06-28 15:21:35 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-29 16:32:25 +0000
commit28deee22489db15ce5529b571eb2691891803b15 (patch)
treeb1801890b5242b204e50f485c8c2d7de78fbd5b6
parent175a4dbb946cbb519771a73a8a37d1ccda3840d9 (diff)
Forward COMPILER_LAUNCHER to the ABI-specific external projects
This allows to speed-up the build of external projects. Change-Id: I3bbdbd6ec5b0920c9e912cb59a6e16c5a8efa0ec Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit c7231177df71879b6d3ebc48288a6d3d8fdab6d0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/corelib/Qt6AndroidMacros.cmake8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index 0e3122bde4..58453f0c5f 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -964,6 +964,14 @@ function(_qt_internal_configure_android_multiabi_target target)
list(APPEND extra_cmake_args "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}")
endif()
+ if(CMAKE_C_COMPILER_LAUNCHER)
+ list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}")
+ endif()
+
+ if(CMAKE_CXX_COMPILER_LAUNCHER)
+ list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}")
+ endif()
+
set(missing_qt_abi_toolchains "")
set(previous_copy_apk_dependencies_target ${target})
# Create external projects for each android ABI except the main one.