Changeset 63448 in vbox for trunk/Config.kmk

Timestamp:

Aug 14, 2016 11:58:07 PM (8 years ago)

Author:

vboxsync

Message:

Config.kmk: working on darwin, added VBOX_GCC_Wno-overloaded-virtual.

File:

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

trunk/Config.kmk

@@ -2570 +2570 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-vla               ?= $(call VBOX_GCC_CHECK_CXX,-Wno-vla,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-overlength-strings?= $(call VBOX_GCC_CHECK_CC,-Wno-overlength-strings,)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-overloaded-virtual?= $(call VBOX_GCC_CHECK_CXX,-Wno-overloaded-virtual,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-stack-protector   ?= $(call VBOX_GCC_CHECK_CC,-fno-stack-protector,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_fno-dwarf2-cfi-asm    ?= $(call VBOX_GCC_CHECK_CC,-fno-dwarf2-cfi-asm,)'
@@ -2712 +2713 @@
         $(VBOX_GCC_Wno-string-plus-int) $(VBOX_GCC_Wno-nested-anon-types)
 VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
-if $(VBOX_GCC_VERSION_CXX) >= 40200 # gcc 4.2.x+ (4.1.2 is causing trouble with the extpack & add builds)
+if $(VBOX_GCC_VERSION_CXX) >= 40200 || defined(VBOX_WITH_MASOCHISTIC_WARNINGS) # gcc 4.2.x+ (4.1.2 is causing trouble with the extpack & add builds)
  VBOX_GCC_WARN_MASOCHISTIC ?= -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter
 endif
-if1of ($(KBUILD_TARGET),linux)
+if $(KBUILD_TARGET) == "linux" || defined(VBOX_GCC_WARN_MASOCHISTIC)
  VBOX_GCC_WARN_PEDANTIC += $(VBOX_GCC_WARN_MASOCHISTIC)
 endif
 
-VBOX_GCC_PEDANTIC_CXX ?= -pedantic $(VBOX_GCC_WARN_PEDANTIC) $(VBOX_GCC_Wno-return-type-c-linkage)
+VBOX_GCC_PEDANTIC_CXX ?= -pedantic $(VBOX_GCC_WARN_PEDANTIC) $(VBOX_GCC_Wno-return-type-c-linkage) $(VBOX_GCC_Wno-overloaded-virtual)
 VBOX_GCC_PEDANTIC_C   ?= -pedantic $(VBOX_GCC_WARN_PEDANTIC) -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Werror-implicit-function-declaration
 
@@ -2869 +2870 @@
 #
 if !defined(VBOX_WITHOUT_NO_GCC_WARNING_POLICY) && !defined(VBOX_WITH_NO_GCC_WARNING_POLICY)
- if1of ($(KBUILD_TARGET),linux)
+ if defined(VBOX_WITH_MASOCHISTIC_WARNINGS) # gcc 4.6.x+
+  VBOX_WITH_NO_GCC_WARNING_POLICY = 1
+  $(info build debug: VBOX_WITH_NO_GCC_WARNING_POLICY = 1 (*))
+ else if1of ($(KBUILD_TARGET),linux)
   if $(VBOX_GCC_VERSION_CXX) >= 40600 # gcc 4.6.x+
    VBOX_WITH_NO_GCC_WARNING_POLICY = 1
-   $(info VBOX_WITH_NO_GCC_WARNING_POLICY=1)
+   $(info build debug: VBOX_WITH_NO_GCC_WARNING_POLICY = 1)
   endif
  endif