Changeset 49583 in vbox

Timestamp:

Nov 20, 2013 12:52:27 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90783

Message:

Config.kmk: require a -std= switch with never gcc versions to compile the traits stuff in <VBox/array.h>

File:

• trunk/Config.kmk (modified) (2 diffs)

trunk/Config.kmk

@@ -2368 +2368 @@
         $(QUIET)$(APPEND) '$@' ' endif'
         $(QUIET)$(APPEND) '$@' 'endif'
+# C++ Std settings
+        $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
+        $(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
+        $(QUIET)$(APPEND) '$@' '  VBOX_GCC_std ?= -std=c++11'
+        $(QUIET)$(APPEND) '$@' ' else ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40600),)'
+        $(QUIET)$(APPEND) '$@' '  VBOX_GCC_std ?= -std=c++0x'
+        $(QUIET)$(APPEND) '$@' ' endif'
+        $(QUIET)$(APPEND) '$@' 'endif'
 ifeq ($(KBUILD_TARGET),solaris)
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args            ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
@@ -4204 +4212 @@
         $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) -Wno-long-long -Wno-non-virtual-dtor -Wshadow \
         -fshort-wchar -fpermissive -fexceptions -frtti $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing \
-        $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden)
+        $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_std)
 TEMPLATE_VBOXMAINEXE_CXXFLAGS.x86        = -m32
 TEMPLATE_VBOXMAINEXE_CXXFLAGS.amd64      = -m64