summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt-distro
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-11-05 17:10:50 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2018-11-06 08:12:05 +0000
commitec33927f7e3f80bbcfde9a46eba201cb6210708f (patch)
treedc3b5aa57314f71a6fbd9315a58b87f9f76fde42 /meta-boot2qt-distro
parent8f42e61ee57faf82965bbf3396e07c3d9c3265a4 (diff)
downloadmeta-boot2qt-ec33927f7e3f80bbcfde9a46eba201cb6210708f.tar.gz
qtbase: disable ltcg on windows host
GCC7 does not support LTO with mingw, which means we cannot use the ltcg option when cross-compiling on Windows host. Update upstream patch that disables ltcg for host_builds and extend it for builds on Windows hosts. Task-number: QTBUG-71596 Fixes: QTBUG-71596 Change-Id: I8ab7ec36f964c95c2189a77bdde6e08bd2817234 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Diffstat (limited to 'meta-boot2qt-distro')
-rw-r--r--meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch30
1 files changed, 30 insertions, 0 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
new file mode 100644
index 0000000..420e718
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtbase/0015-Disable-ltcg-for-host_build.patch
@@ -0,0 +1,30 @@
1From 9b541f4f6272c4ed4bb5bf6591e9a65cded6fdfa Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@qt.io>
3Date: Tue, 23 Oct 2018 09:54:57 +0300
4Subject: [PATCH] Disable ltcg for host_build
5
6debug-prefix-map does not work correctly for static libraries
7when using ltcg, and since host_build compilations link agaist
8the libQt5Bootstrap.a library, it breaks source file packaging
9into debug packages.
10
11Also disable ltcg when compiling on Windows host platform,
12as GCC7 does not support lto with mingw.
13
14Task-number: QTBUG-71230
15Change-Id: I5bea76ea03bf1943b0cfaf03d46a4840bd99a28b
16Upstream-Status: Inappropriate [embedded specific]
17---
18 mkspecs/features/ltcg.prf | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/mkspecs/features/ltcg.prf b/mkspecs/features/ltcg.prf
22index ccf0226272..00118be872 100644
23--- a/mkspecs/features/ltcg.prf
24+++ b/mkspecs/features/ltcg.prf
25@@ -1,4 +1,4 @@
26-CONFIG(release, debug|release) {
27+CONFIG(release, debug|release):!host_build:!equals(QMAKE_HOST.os, Windows) {
28 # 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
30 # in the first place. On others, we have special ar and nm to create the symbol