diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-12 19:12:26 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-12 22:34:12 +0200 |
| commit | a08bf7f00ab64fd3ae7376d8dd50ca8a37bee3e3 (patch) | |
| tree | ab209fc07b14123c8f9f554b3a9f5f790609209b /src/tools/bootstrap | |
| parent | 2158e764dc374239fa346656d5a93ac2ffd7af33 (diff) | |
CMake: Fix usage of gc_binaries feature
The qt_internal_apply_gc_binaries function should apply both compile
and link flags, not just link flags.
The flags should be applied publically to all consumers of Bootstrap
regardless if the gc_binaries feature is enabled.
The flags should be applied publically to Core only in case if the
feature is enabled (aka for static builds only).
Change-Id: Id42af0d9b527004d74c04eff2c9e3c2be1e76aac
Fixes: QTBUG-84461
Task-number: QTBUG-83929
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'src/tools/bootstrap')
| -rw-r--r-- | src/tools/bootstrap/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt index b734f4fc5d..8b3a6e96d0 100644 --- a/src/tools/bootstrap/CMakeLists.txt +++ b/src/tools/bootstrap/CMakeLists.txt @@ -261,7 +261,7 @@ qt_extend_target(Bootstrap CONDITION MINGW AND WIN32 # QMAKE_CFLAGS = "$$QMAKE_CFLAGS_SHSTK" # special case begin -qt_internal_add_link_flags_gc_sections(Bootstrap PUBLIC) +qt_internal_apply_gc_binaries(Bootstrap PUBLIC) set_target_properties(Bootstrap PROPERTIES AUTOMOC OFF AUTOUIC OFF AUTORCC OFF) qt_internal_add_target_aliases(Bootstrap) qt_enable_msvc_cplusplus_define(Bootstrap PUBLIC) |