From 28deee22489db15ce5529b571eb2691891803b15 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 28 Jun 2022 15:21:35 +0200 Subject: [PATCH] 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 Reviewed-by: Qt CI Bot (cherry picked from commit c7231177df71879b6d3ebc48288a6d3d8fdab6d0) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6AndroidMacros.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 0e3122bde41..58453f0c5fe 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.