diff options
author | Michal Klocek <michal.klocek@qt.io> | 2018-12-03 15:30:26 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2019-02-11 15:49:47 +0000 |
commit | 376345e0a27f483c62198f54775a267ddbc0ab90 (patch) | |
tree | c367eea84839494370c7583c96283eb858d77c66 | |
parent | 3b19a50d912712be99b82f8c5c8af94db57a9eaf (diff) |
Fix use_gold gn argument
We add already use_gold in toolchain setup, however
for default toolchain toolchain_args are ignored,
Therefore use_gold has to be set explicilty in linux.pri.
Task-number: QTBUG-73216
Change-Id: If1c8f9df998719d88184d0e5eee525b871d682df
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r-- | src/core/config/linux.pri | 6 | ||||
-rw-r--r-- | src/core/core_common.pri | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index 85b948db2..e258b8ae4 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -19,11 +19,11 @@ gn_args += \ qtConfig(webengine-embedded-build) { gn_args += is_desktop_linux=false - gn_args += use_gold=false -} else { - !use_gold_linker: gn_args += use_gold=false } +use_gold_linker: gn_args += use_gold=true +else: gn_args += use_gold=false + clang { clang_full_path = $$which($${QMAKE_CXX}) # Remove the "/bin/clang++" part. diff --git a/src/core/core_common.pri b/src/core/core_common.pri index 5f9f3c4f6..8375d89e5 100644 --- a/src/core/core_common.pri +++ b/src/core/core_common.pri @@ -13,3 +13,7 @@ CONFIG -= ltcg # Chromium requires C++14 CONFIG += c++14 + +#QTBUG-73216 ci has to be updated with latest yocto +boot2qt: CONFIG -= use_gold_linker + |