From db6690e9e6fb823925e68df9b4bf6bdc785f1b04 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 23 Jun 2021 11:30:14 +0200 Subject: Pass compiler wrapper to GN Change-Id: I1ce6e9d0e03bb780f85636865e15552ac28876fa Reviewed-by: Michal Klocek (cherry picked from commit 1efcf20bcc1d41edb56d4ef491dc9c26b7a98f15) Reviewed-by: Qt Cherry-pick Bot --- CMakeLists.txt | 6 ++++++ src/core/CMakeLists.txt | 3 +++ 2 files changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index dbd925dc0..ff98c705a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,6 +126,12 @@ list(APPEND libsCmakeArgs "-DWEBENGINE_REPO_BUILD=TRUE" "${featureList}" ) +if (CMAKE_C_COMPILER_LAUNCHER) + list(APPEND libsCmakeArgs "-DCMAKE_C_COMPILER_LAUNCHER=${CMAKE_C_COMPILER_LAUNCHER}") +endif() +if (CMAKE_CXX_COMPILER_LAUNCHER) + list(APPEND libsCmakeArgs "-DCMAKE_CXX_COMPILER_LAUNCHER=${CMAKE_CXX_COMPILER_LAUNCHER}") +endif() if(LINUX) set(cmd "${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/src") diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index f12be9cc7..6c73e694f 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -284,6 +284,9 @@ foreach(config ${configs}) elseif(${config} STREQUAL "MinSizeRel") list(APPEND gnArgArg is_debug=false symbol_level=0 optimize_for_size=true) endif() + if (CMAKE_CXX_COMPILER_LAUNCHER) + list(APPEND gnArgArg cc_wrapper="${CMAKE_CXX_COMPILER_LAUNCHER}") + endif() list(APPEND gnArgArg qtwebengine_target="${buildDir}/${config}:QtWebEngineCore" -- cgit v1.2.3