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

Fix Multi-ABI builds when CMAKE_<C/CXX>_COMPILER_LAUNCHER contains list

Browse Source 
Add list-escaping for CMAKE_<C/CXX>_COMPILER_LAUNCHER variables when
passing them to an external ABI-specific Android project.

Amends c7231177df71879b6d3ebc48288a6d3d8fdab6d0

Change-Id: I0c98eee6594c395dc6a37465a99ea32b1af39b84
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit a2809d9ec1c4351bc356e05e8f3c1db0363bef86)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2022-08-18 18:34:47 +02:00 committed by Qt Cherry-pick Bot
parent 70783deaa1
commit 3eb367095f
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/Qt6AndroidMacros.cmake
View File

@ -971,11 +971,17 @@ function(_qt_internal_configure_android_multiabi_target target)
endif()
if(CMAKE_C_COMPILER_LAUNCHER)
list(APPEND extra_cmake_args "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}")
list(JOIN CMAKE_C_COMPILER_LAUNCHER "$<SEMICOLON>"
compiler_launcher)
list(APPEND extra_cmake_args
"-DCMAKE_C_COMPILER_LAUNCHER=${compiler_launcher}")
endif()
if(CMAKE_CXX_COMPILER_LAUNCHER)
list(APPEND extra_cmake_args "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}")
list(JOIN CMAKE_CXX_COMPILER_LAUNCHER "$<SEMICOLON>"
compiler_launcher)
list(APPEND extra_cmake_args
"-DCMAKE_CXX_COMPILER_LAUNCHER=${compiler_launcher}")
endif()
set(missing_qt_abi_toolchains "")