Changeset 63335 in vbox

Timestamp:

Aug 11, 2016 12:23:38 PM (8 years ago)

Author:

vboxsync

Message:

Config: Don't strip VBOX_VCC_WERR from non-pedantic templates. Non-pedantic just means we disable a bunch of warnings, but we still want warning free builds.

File:

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

trunk/Config.kmk

@@ -4526 +4526 @@
 
 #
-# Temporary: Renaming the template and warnings will be errors (soon).
+# Temporary: Renaming the template and warnings will be errors ("soon").
 #
 TEMPLATE_VBoxR3Dll                     += VBox ring-3 SO/DLLs, no warnings
@@ -4690 +4690 @@
 TEMPLATE_VBoxR3StaticNonPedantic_EXTENDS   = VBoxR3Static
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBoxR3StaticNonPedantic_CXXFLAGS = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBoxR3Static_CXXFLAGS)) $(VBOX_VCC_NON_PEDANTIC)
- TEMPLATE_VBoxR3StaticNonPedantic_CFLAGS   = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBoxR3Static_CFLAGS))   $(VBOX_VCC_NON_PEDANTIC)
+ TEMPLATE_VBoxR3StaticNonPedantic_CXXFLAGS = $(TEMPLATE_VBoxR3Static_CXXFLAGS) $(VBOX_VCC_NON_PEDANTIC)
+ TEMPLATE_VBoxR3StaticNonPedantic_CFLAGS   = $(TEMPLATE_VBoxR3Static_CFLAGS)   $(VBOX_VCC_NON_PEDANTIC)
 else # gcc:
  TEMPLATE_VBoxR3StaticNonPedantic_TOOL     = $(VBOX_GCC_TOOL)
@@ -4996 +4996 @@
 TEMPLATE_VBoxR3DllNonPedantic_EXTENDS       = VBOXR3
 ifeq ($(KBUILD_TARGET),win)
- TEMPLATE_VBoxR3DllNonPedantic_CXXFLAGS     = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBOXR3_CXXFLAGS)) $(VBOX_VCC_NON_PEDANTIC)
- TEMPLATE_VBoxR3DllNonPedantic_CFLAGS       = $(filter-out $(VBOX_VCC_WERR), $(TEMPLATE_VBOXR3_CFLAGS))   $(VBOX_VCC_NON_PEDANTIC)
+ TEMPLATE_VBoxR3DllNonPedantic_CXXFLAGS     = $(TEMPLATE_VBOXR3_CXXFLAGS) $(VBOX_VCC_NON_PEDANTIC)
+ TEMPLATE_VBoxR3DllNonPedantic_CFLAGS       = $(TEMPLATE_VBOXR3_CFLAGS)   $(VBOX_VCC_NON_PEDANTIC)
 else # gcc:
  TEMPLATE_VBoxR3DllNonPedantic_TOOL         = $(VBOX_GCC_TOOL)