(Rudimentary) C++11 support is a hard requirement now

Change-Id: I43ed776d52336b822aa6152f0f2a29e39303bb75

4 files changed, 6 insertions, 20 deletions

diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index fa7be036280f..3d407300cc60 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -56,7 +56,7 @@ gb_CXXFLAGS := \
 	-Wno-non-virtual-dtor \
 	-fno-strict-aliasing \
 	-fsigned-char \
-	$(if $(filter TRUE,$(HAVE_CXX11)),$(CXXFLAGS_CXX11))
+	$(CXXFLAGS_CXX11)
 
 	#-Wshadow \ break in compiler headers already
 	#-fsigned-char \ might be removed?
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index edfdee58b7e7..97196162c29c 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -47,17 +47,13 @@ gb_CXXFLAGS := \
 	-Wshadow \
 	-Wuninitialized \
 	-fno-strict-aliasing \
-
+	-std=gnu++0x \
 
 ifneq ($(SYSBASE),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
 gb_CFLAGS += --sysroot=$(SYSBASE)
 endif
 
-ifeq ($(HAVE_CXX11),TRUE)
-gb_CXXFLAGS += -std=gnu++0x
-endif
-
 # At least sal defines its own __main, which would cause DLLs linking against
 # sal to pick up sal's __main instead of the one from MinGW's dllcrt2.o:
 gb_LinkTarget_LDFLAGS := \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index a781a6c88a48..94deeef76f41 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -62,6 +62,7 @@ gb_CXXFLAGS := \
 	-Wshadow \
 	-Woverloaded-virtual \
 	-Wno-non-virtual-dtor \
+	-std=c++0x \
 
 # enable debug STL
 ifeq ($(gb_ENABLE_DBGUTIL),$(true))
@@ -83,22 +84,16 @@ gb_CXXFLAGS += -fno-strict-aliasing
 endif
 endif
 
-ifeq ($(HAVE_CXX11),TRUE)
-#Currently, as well as for its own merits, c++11/c++0x mode allows use to use
-#a template for SAL_N_ELEMENTS to detect at compiler time its misuse
-gb_CXXFLAGS += -std=c++0x
-
 #We have so many std::auto_ptr uses that we need to be able to disable
 #warnings for those so that -Werror continues to be useful, seeing as moving
 #to unique_ptr isn't an option when we must support different compilers
-
+#
 #When we are using 4.6.0 we can use gcc pragmas to selectively silence auto_ptr
 #warnings in isolation, but for <= 4.5.X we need to globally disable
 #deprecation
 ifeq ($(HAVE_GCC_PRAGMA_OPERATOR),)
 gb_CXXFLAGS += -Wno-deprecated-declarations
 endif
-endif
 
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 94526abcdeb4..df68e948891b 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -43,6 +43,7 @@ gb_CXXFLAGS := \
 	-fPIC \
 	-Wshadow \
 	-Woverloaded-virtual \
+	$(CXXFLAGS_CXX11) \
 
 ifeq ($(COM_GCC_IS_CLANG),)
 gb_GccLess460 := $(shell expr $(GCC_VERSION) \< 406)
@@ -79,22 +80,16 @@ gb_COMPILERDEFS += \
 
 endif
 
-ifeq ($(HAVE_CXX11),TRUE)
-#Currently, as well as for its own merits, c++11/c++0x mode allows use to use
-#a template for SAL_N_ELEMENTS to detect at compiler time its misuse
-gb_CXXFLAGS += $(CXXFLAGS_CXX11)
-
 #We have so many std::auto_ptr uses that we need to be able to disable
 #warnings for those so that -Werror continues to be useful, seeing as moving
 #to unique_ptr isn't an option when we must support different compilers
-
+#
 #When we are using 4.6.0 we can use gcc pragmas to selectively silence auto_ptr
 #warnings in isolation, but for <= 4.5.X we need to globally disable
 #deprecation
 ifeq ($(HAVE_GCC_PRAGMA_OPERATOR),)
 gb_CXXFLAGS += -Wno-deprecated-declarations
 endif
-endif
 
 ifneq ($(strip $(SYSBASE)),)
 gb_CXXFLAGS += --sysroot=$(SYSBASE)