diff --git a/qt4/lib/mk/qt_jscore.mk b/qt4/lib/mk/qt_jscore.mk index 8352ad949..0bf2f99d3 100644 --- a/qt4/lib/mk/qt_jscore.mk +++ b/qt4/lib/mk/qt_jscore.mk @@ -11,6 +11,13 @@ CC_CXX_OPT += -D_GLIBCXX_USE_C99_MATH # use default warning level to avoid noise when compiling contrib code CC_WARN = +# some parts of the library are not C++11 compatible +CC_CXX_OPT_STD = + +# StackBounds includes Genode headers, which rely on C++11. Hence, we need +# to selectively enable C++11 for this compilation unit. +CC_OPT_StackBounds = -std=gnu++11 + include $(REP_DIR)/lib/mk/qt_jscore_generated.inc include $(REP_DIR)/lib/mk/qt.inc diff --git a/qt4/lib/mk/qt_webcore.mk b/qt4/lib/mk/qt_webcore.mk index c3a683d77..5701466bd 100644 --- a/qt4/lib/mk/qt_webcore.mk +++ b/qt4/lib/mk/qt_webcore.mk @@ -13,6 +13,9 @@ CC_WARN = -Wno-deprecated-declarations CC_OPT_sqlite3 += -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast +# some parts of the library are not C++11 compatible +CC_CXX_OPT_STD = + include $(REP_DIR)/lib/mk/qt_webcore_generated.inc include $(REP_DIR)/lib/mk/qt.inc diff --git a/qt4/lib/mk/qt_webkit.mk b/qt4/lib/mk/qt_webkit.mk index f98dde23a..680f65eae 100644 --- a/qt4/lib/mk/qt_webkit.mk +++ b/qt4/lib/mk/qt_webkit.mk @@ -13,6 +13,9 @@ CC_WARN = -Wno-deprecated-declarations CC_OPT_sqlite3 += -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast +# some parts of the library are not C++11 compatible +CC_CXX_OPT_STD = + include $(REP_DIR)/lib/mk/qt_webkit_generated.inc include $(REP_DIR)/lib/mk/qt.inc