diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-19 21:54:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-20 17:06:50 +0000 |
| commit | 5060740fa980fdd5d2828b3b7e8956386266a7eb (patch) | |
| tree | a846e50607751577bb0d84e651209192d5574b8f /mkspecs | |
| parent | 8f960badfcf3afdf2d489dfb7ccc96a656ae0f9d (diff) | |
utilize configure results better in native builds
don't ignore detected features for host tools when we're not actually
cross-building.
Change-Id: Id62a3c1c6b7ae422b14efb4fbea0892b05a047cc
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/default_post.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt_common.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/default_post.prf b/mkspecs/features/default_post.prf index e7e9a5bd87..7f5ab3a10c 100644 --- a/mkspecs/features/default_post.prf +++ b/mkspecs/features/default_post.prf @@ -60,7 +60,7 @@ debug { } # disable special linker flags for host builds (no proper test for host support yet) -!host_build { +!host_build|!cross_compile { use_gold_linker: QMAKE_LFLAGS += $$QMAKE_LFLAGS_USE_GOLD enable_new_dtags: QMAKE_LFLAGS += $$QMAKE_LFLAGS_NEW_DTAGS } diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 7967697eb4..2dfc22f16e 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -17,7 +17,7 @@ qtConfig(c++14): CONFIG += c++14 qtConfig(c++1z): CONFIG += c++1z contains(TEMPLATE, .*lib) { # module and plugins - !host_build:qtConfig(reduce_exports): CONFIG += hide_symbols + if(!host_build|!cross_compile):qtConfig(reduce_exports): CONFIG += hide_symbols unix:qtConfig(reduce_relocations): CONFIG += bsymbolic_functions qtConfig(separate_debug_info): CONFIG += separate_debug_info |