diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-12 15:38:11 +0200 |
---|---|---|
committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-11-14 14:36:24 +0000 |
commit | 8d854724ae70112e0961303ae8119510dedf799e (patch) | |
tree | 68d91265dfdd58ed4ee551b47b89eedc0283f1d2 /meta-boot2qt-distro/recipes-qt | |
parent | 4a454acbe91846ad177cd69cf8b329445c674f99 (diff) | |
download | meta-boot2qt-8d854724ae70112e0961303ae8119510dedf799e.tar.gz |
qtbase: disable lto for static libs
If static libs are compiled with lto and tried to be used
on a Window host, the linker will fail with error:
"plugin needed to handle lto object"
Fixed: QTBUG-71749
Change-Id: I8811faca15307d82173b6ee9e5ffca1114898cd9
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt-distro/recipes-qt')
-rw-r--r-- | meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch index 420e718..a7ee953 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch | |||
@@ -11,6 +11,9 @@ into debug packages. | |||
11 | Also disable ltcg when compiling on Windows host platform, | 11 | Also disable ltcg when compiling on Windows host platform, |
12 | as GCC7 does not support lto with mingw. | 12 | as GCC7 does not support lto with mingw. |
13 | 13 | ||
14 | Disable also for static builds since those libraries can be linked | ||
15 | on Windows host, where the lto built binaries won't work. | ||
16 | |||
14 | Task-number: QTBUG-71230 | 17 | Task-number: QTBUG-71230 |
15 | Change-Id: I5bea76ea03bf1943b0cfaf03d46a4840bd99a28b | 18 | Change-Id: I5bea76ea03bf1943b0cfaf03d46a4840bd99a28b |
16 | Upstream-Status: Inappropriate [embedded specific] | 19 | Upstream-Status: Inappropriate [embedded specific] |
@@ -24,7 +27,7 @@ index ccf0226272..00118be872 100644 | |||
24 | +++ b/mkspecs/features/ltcg.prf | 27 | +++ b/mkspecs/features/ltcg.prf |
25 | @@ -1,4 +1,4 @@ | 28 | @@ -1,4 +1,4 @@ |
26 | -CONFIG(release, debug|release) { | 29 | -CONFIG(release, debug|release) { |
27 | +CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows) { | 30 | +CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows):!staticlib { |
28 | # We need fat object files when creating static libraries on some platforms | 31 | # We need fat object files when creating static libraries on some platforms |
29 | # so the linker will know to load a particular object from the library | 32 | # so the linker will know to load a particular object from the library |
30 | # in the first place. On others, we have special ar and nm to create the symbol | 33 | # in the first place. On others, we have special ar and nm to create the symbol |