From 175a4dbb946cbb519771a73a8a37d1ccda3840d9 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 28 Jun 2022 15:19:44 +0200 Subject: [PATCH] Use the main ABI's CMAKE_MAKE_PROGRAM in ABI-specific external projects Change-Id: Ie35b6a334be419d3182fe77f9d70153cd1fd8a51 Reviewed-by: Alexandru Croitor (cherry picked from commit f2d9e76451ffb4f890a97cb218fd733fb5960111) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6AndroidMacros.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 9c73e5617b1..0e3122bde41 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -960,6 +960,10 @@ function(_qt_internal_configure_android_multiabi_target target) list(APPEND extra_cmake_args "-DANDROID_NDK_ROOT=${ANDROID_NDK}") endif() + if(CMAKE_MAKE_PROGRAM) + list(APPEND extra_cmake_args "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}") + endif() + set(missing_qt_abi_toolchains "") set(previous_copy_apk_dependencies_target ${target}) # Create external projects for each android ABI except the main one.