summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-10-01 11:13:56 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-10-01 11:14:00 +0200
commitb31bcdfe82f88d3b9adbbc2299e4f18a0e92c1d6 (patch)
tree01a6dbb5a6e3f5c8f3a9548b523e965c7648aa3f
parentb9e4d36632393010f190f70e66e4e3a39ec15060 (diff)
downloadptxdist-b31bcdfe82f88d3b9adbbc2299e4f18a0e92c1d6.tar.gz
ptxdist-b31bcdfe82f88d3b9adbbc2299e4f18a0e92c1d6.tar.xz
qt4: fix building with gcc-7.x
Qt4 fails to build with -std=gnu++14 (the default for gcc-7.x). Set -std=gnu++98 to fix this (inspired by Debian). Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/qt4.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/rules/qt4.make b/rules/qt4.make
index 5148ac8c0..ec3549b98 100644
--- a/rules/qt4.make
+++ b/rules/qt4.make
@@ -45,7 +45,7 @@ $(STATEDIR)/qt4.extract:
sed -e "s,@COMPILER_PREFIX@,$(COMPILER_PREFIX),g" \
-e "s,@CPPFLAGS@,$(CROSS_CPPFLAGS),g" \
-e "s,@CFLAGS@,$(CROSS_CFLAGS),g" \
- -e "s,@CXXFLAGS@,$(CROSS_CXXFLAGS),g" \
+ -e "s,@CXXFLAGS@,$(CROSS_CXXFLAGS) -std=gnu++98,g" \
-e "s,@INCDIR@,$(SYSROOT)/include $(SYSROOT)/usr/include,g" \
-e "s,@LIBDIR@,$(SYSROOT)/usr/lib,g" \
-e "s#@LDFLAGS@#$(strip $(CROSS_LDFLAGS))#g" \