Changeset 83214 in vbox

Timestamp:

Mar 5, 2020 11:31:08 PM (5 years ago)

Author:

vboxsync

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

136354

Message:

Webservices warning fixes (gcc 9.2).

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/Main/webservice/Makefile.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -2832 +2832 @@
         $(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CC),40500),)'
         $(QUIET)$(APPEND) '$@' '  VBOX_GCC_Wlogical-op         ?= $(call VBOX_GCC_CHECK_CC,-Wlogical-op,)'
+        $(QUIET)$(APPEND) '$@' '  VBOX_GCC_Wno-logical-op      ?= $$(subst -Wlogical-op,-Wno-logical-op,$$(VBOX_GCC_Wlogical-op))
         $(QUIET)$(APPEND) '$@' ' endif'
         $(QUIET)$(APPEND) '$@' 'endif'

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -210 +210 @@
 TEMPLATE_VBOXWEBR3EXE_CXXFLAGS = $(filter-out $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden),\
                                  $(TEMPLATE_VBOXR3EXE_CXXFLAGS))
+ifn1of ($(KBUILD_TARGET), win)
+TEMPLATE_VBOXWEBR3EXE_CXXFLAGS += $(VBOX_GCC_Wno-misleading-indentation)
+endif
 
 ifdef VBOX_GSOAP_INSTALLED
@@ -293 +296 @@
         -Wno-format \
         $(VBOX_GCC_Wno-int-in-bool-context) \
-        $(if $(VBOX_GCC_Wlogical-op),-Wno-error=logical-op,)
+        $(VBOX_GCC_Wno-logical-op)
    # currently necessary when compiling against OpenSSL 1.0 due to a missing
    # typecase from 'const v3_ext_method*' to 'aka v3_ext_method*'.
@@ -356 +359 @@
  vboxwebsrv_CXXFLAGS.win += -bigobj
  ifn1of ($(KBUILD_TARGET), win)
-  vboxwebsrv_CXXFLAGS += -Wno-shadow $(VBOX_GCC_Wno-literal-suffix)
+  vboxwebsrv_CXXFLAGS += -Wno-shadow $(VBOX_GCC_Wno-literal-suffix) $(VBOX_GCC_Wno-misleading-indentation)
   ifn1of ($(KBUILD_TYPE), debug) # Save time+memory by using -O1 instead of -O2.
    vboxwebsrv_CXXFLAGS += -O0
@@ -374 +377 @@
         $(VBOXWEB_OUT_DIR)/methodmaps.cpp \
         $(VBOXWEB_OUT_DIR)/soapServer.cpp \
-    $(VBOXWEB_OUT_DIR)/vboxweb-wsdl.c
+        $(VBOXWEB_OUT_DIR)/vboxweb-wsdl.c
  vboxwebsrv_SOURCES.win = \
         VBoxWebSrv.rc
@@ -380 +383 @@
         $(VBOXWEB_OUT_DIR)/methodmaps.cpp \
         $(VBOXWEB_OUT_DIR)/soapServer.cpp \
-    $(VBOXWEB_OUT_DIR)/vboxweb-wsdl.c
- # gcc 6.2 warns about aborting misleading indentation detection (too much code)
- vboxweb.cpp_CXXFLAGS = \
-        $(VBOX_GCC_Wno-misleading-indentation)
+        $(VBOXWEB_OUT_DIR)/vboxweb-wsdl.c
  vboxwebsrv_ORDERDEPS = $(VBOXWEB_OUT_DIR)/gsoap_copy_all_ts
  endif # !VBOX_ONLY_SDK