summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@qt.io>2022-05-18 12:38:26 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-06-09 16:59:03 +0000
commit9949d933571467e4ab129ac2fefe9d39db613d37 (patch)
tree3cb60948ab3663b28f7afe21fd58861e072c40f8
parentabd2cb3bfd82710e371ff8a19e148e90f214aadf (diff)
Pass archiver to gn build
User can override with env variable AR archiver for cross compilation, pass archiver from cmake for gn. Fixes: QTBUG-103578 Change-Id: I055d7403ecb829f4b1bbe57ec27c0bca7323484c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 09a4ad989c815a2aa0fb401011f1ccb50751be72) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/gn/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gn/CMakeLists.txt b/src/gn/CMakeLists.txt
index a76d1dcee..37665465d 100644
--- a/src/gn/CMakeLists.txt
+++ b/src/gn/CMakeLists.txt
@@ -36,6 +36,7 @@ add_custom_command(
--cc ${CMAKE_C_COMPILER}
--cxx ${CMAKE_CXX_COMPILER}
--ld ${CMAKE_CXX_COMPILER}
+ --ar ${CMAKE_AR}
--qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io"
$<$<PLATFORM_ID:Darwin>:--isysroot>
$<$<PLATFORM_ID:Darwin>:${CMAKE_OSX_SYSROOT}>