summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@theqtcompany.com>2015-09-16 14:13:40 +0300
committerSamuli Piippo <samuli.piippo@theqtcompany.com>2015-09-16 15:26:42 +0000
commit2c230725cb4c6b3a37df9413a8ca4b6ad56d2583 (patch)
tree8068e95c5d86eed17351e5d6ae3cb6c1f7c67574 /recipes-qt/qt5/qtbase
parent1fc629a20dd675bf5e37e90cc2d60017f4e9ddce (diff)
downloadmeta-boot2qt-2c230725cb4c6b3a37df9413a8ca4b6ad56d2583.tar.gz
qt5: add workaround for gcc's internal compiler error
Crosscompilation of qdoc causes gcc internal compiler error on some platforms. Removing the c++11 option from the compilation prevents this. Change-Id: I0ad5832859f8c79dba401ecc1d9026559a1ec324 Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch29
1 files changed, 29 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch
new file mode 100644
index 0000000..85e569f
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0001-qdoc-workaround-for-gcc-s-ICE.patch
@@ -0,0 +1,29 @@
1From 75840ad8b40068b70792a27f1fdc7cccf3d28f7c Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@theqtcompany.com>
3Date: Wed, 16 Sep 2015 13:30:38 +0300
4Subject: [PATCH] qdoc: workaround for gcc's ICE
5
6Remove c++11 option from compilation to prevent gcc's internal compiler error:
7in add_stores, at var-tracking.c:6000
8
9Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
10---
11 src/tools/qdoc/qdoc.pro | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro
15index f0df113..a847482 100644
16--- a/src/tools/qdoc/qdoc.pro
17+++ b/src/tools/qdoc/qdoc.pro
18@@ -4,6 +4,8 @@
19 requires(!contains(QT_DISABLED_FEATURES, dom))
20 }
21
22+QMAKE_CXXFLAGS_CXX11 =
23+
24 option(host_build)
25 QT = core xml
26
27--
281.9.1
29