From f10449c7a6eb9e1b555128b40bacd5b66ee6cc33 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 12 Jun 2014 07:28:13 +0000 Subject: [PATCH] defs.mk: Disable c++11 features for gcc 4.1.0 (quick hack) Signed-off-by: Jan Lindemann --- make/defs.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/make/defs.mk b/make/defs.mk index 2d07b66b..3ea35e92 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -137,7 +137,7 @@ BUILD_CPPFLAGS += $(CPPFLAGS) BUILD_LDFLAGS += $(LDFLAGS) BUILD_CFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -fexceptions -DPROJECT_STR=\"$(PROJECT)\" -BUILD_CPPFLAGS += -std=c++11 -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\" +BUILD_CPPFLAGS += -D_FILE_OFFSET_BITS=64 -Wall -Wno-unused-value -Wno-deprecated -DPROJECT_STR=\"$(PROJECT)\" BUILD_LDFLAGS += -Wall ifneq ($(LOG_QUAL_PREFIX),) @@ -203,6 +203,12 @@ GCC_MAJOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3, GCC_MINOR = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[2];}') GCC_REV = $(shell gcc -v 2>&1 | grep version | awk '{ split($$3,a,"."); print a[3];}') +ifneq ($(GCC_VERSION),4.1.0) +BUILD_CPPFLAGS += -std=c++11 +else +BUILD_CPPFLAGS += -Doverride +endif + LD_VERSION = $(shell ld -V | $(SED) '/GNU ld/ !d; s/(.*)//; s/[^0-9.-]*//') LD_MAJOR = $(shell echo $(LD_VERSION) | cut -d. -f1) LD_MINOR = $(shell echo $(LD_VERSION) | cut -d. -f2)