From f1dcaa746d7657699f148e8a4f80d8a7ba0a6fdd Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 18 Sep 2013 16:15:24 +0200 Subject: [PATCH] Enable C++11 by default --- base-hw/src/core/target.inc | 3 --- base/mk/global.mk | 6 ++++++ os/src/server/nitpicker/target.mk | 3 --- ports/src/vancouver/target.inc | 1 - 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/base-hw/src/core/target.inc b/base-hw/src/core/target.inc index 92172f217..3f528af96 100644 --- a/base-hw/src/core/target.inc +++ b/base-hw/src/core/target.inc @@ -13,9 +13,6 @@ CC_OPT += -DCORE_MAIN=_main # add library dependencies LIBS += base-common -# enable C++11 support -CC_CXX_OPT += -std=gnu++11 - # add include paths INC_DIR += $(REP_DIR)/src/core \ $(REP_DIR)/src/core/include \ diff --git a/base/mk/global.mk b/base/mk/global.mk index 7be10f3b8..701b0b4b5 100644 --- a/base/mk/global.mk +++ b/base/mk/global.mk @@ -115,6 +115,12 @@ CC_CXX_OPT += $(CC_OPT) CC_C_OPT += $(CC_OPT) CC_ADA_OPT += $(CC_OLEVEL) $(CC_WARN) +# +# Enable C++11 by default +# +CC_CXX_OPT_STD ?= -std=gnu++11 +CC_CXX_OPT += $(CC_CXX_OPT_STD) + # # Linker options # diff --git a/os/src/server/nitpicker/target.mk b/os/src/server/nitpicker/target.mk index 71268b441..1581f4162 100644 --- a/os/src/server/nitpicker/target.mk +++ b/os/src/server/nitpicker/target.mk @@ -7,6 +7,3 @@ SRC_CC = main.cc \ global_keys.cc SRC_BIN = default.tff - -# enable C++11 support -CC_CXX_OPT += -std=gnu++11 diff --git a/ports/src/vancouver/target.inc b/ports/src/vancouver/target.inc index 61d6a2b0d..15babd0e0 100644 --- a/ports/src/vancouver/target.inc +++ b/ports/src/vancouver/target.inc @@ -36,7 +36,6 @@ INC_DIR += $(VANCOUVER_DIR)/include $(GENODE_DIR)/include INC_DIR += $(NOVA_INCLUDE_DIR) CC_WARN += -Wno-parentheses -CC_CXX_OPT += -std=gnu++11 CC_CXX_OPT += -march=core2 CC_CXX_OPT += -mssse3