Changeset 98215 in vbox

Timestamp:

Jan 22, 2023 10:29:23 PM (2 years ago)

Author:

vboxsync

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

155404

Message:

/Config.kmk,FE/Qt/Makefile.kmk: Use VBOX_GCC_Wno-deprecated-copy rather than assuming all gcc versions knows it, likewise -Wno-deprecated-copy must be detected before used. bugref:10348

Location:

trunk

Files:

• Config.kmk (modified) (3 diffs)
• src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (3 diffs)

trunk/Config.kmk

@@ -3338 +3338 @@
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-inline                     ?= $(call VBOX_GCC_CHECK_CXX,-Wno-inline,)'
         $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-unknown-pragmas            ?= $(call VBOX_GCC_CHECK_CXX,-Wno-unknown-pragmas,)'
+        $(QUIET)$(APPEND) '$@' 'VBOX_GCC_Wno-deprecated-copy            ?= $(call VBOX_GCC_CHECK_CXX,-Wno-deprecated-copy,)'
         $(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,)'
@@ -7948 +7949 @@
    TEMPLATE_VBoxQtGuiExe_CXXFLAGS += -fPIC
    # Needed for GCC 9. Even system's Qt 5.12.4 (on Ubuntu 19.10) did not have this fixed yet.
-   TEMPLATE_VBoxQtGuiExe_CXXFLAGS.linux = -Wno-deprecated-copy $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS)
+   TEMPLATE_VBoxQtGuiExe_CXXFLAGS.linux = $(VBOX_GCC_Wno-deprecated-copy) $(TEMPLATE_VBoxQtGuiExe_CXXFLAGS)
    TEMPLATE_VBoxQtGuiExe_LDFLAGS  += -fPIC
  endif # not darwin, os2 or win
@@ -8731 +8732 @@
 #
 # Guest additions libraries (all static).
-#   The _MINI and _SHARED are both compiled as PIC and intended for linking into a .so/.dll/.dylib.
+#   The _SHARED variants are compiled as PIC and intended for linking into a .so/.dll/.dylib.
 #
 VBOX_LIB_IPRT_GUEST_R3           = $(VBOX_PATH_ADDITIONS_LIB)/RuntimeGuestR3$(VBOX_SUFF_LIB)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -384 +384 @@
 endif
 
-VirtualBox_CXXFLAGS.linux += -Wno-class-memaccess
+VirtualBox_CXXFLAGS.linux += $(VBOX_GCC_Wno-class-memaccess)
 
 ## @todo we're using a number of deprecated APIs, please fix and remove these!
@@ -415 +415 @@
 endif
 
-VirtualBoxVM_CXXFLAGS.linux += -Wno-class-memaccess
+VirtualBoxVM_CXXFLAGS.linux += $(VBOX_GCC_Wno-class-memaccess)
 
 ## @todo we're using a number of deprecated APIs, please fix and remove these!
@@ -446 +446 @@
 #
 
-UICommon_CXXFLAGS.linux += -Wno-class-memaccess
+UICommon_CXXFLAGS.linux += $(VBOX_GCC_Wno-class-memaccess)
 UICommon_CXXFLAGS.win += -wd4868 # prevents std::stable_sort from using functor/function comparator
 UICommon_CXXFLAGS.win += -bigobj # COMWrappers.cpp fails with too many sections on win64-dep otherwise.