Changeset 106648 in vbox

Timestamp:

Oct 24, 2024 9:24:58 AM (5 weeks ago)

Author:

vboxsync

Message:

Devices/Makefile.kmk: Fixed warning about undefined VBoxDDR0_0_OUTDIR on win.arm64 caused by applying VBOX_SET_VER_INFO_R0 to VBoxDDR0 without guards. jiraref:VBP-1253

File:

• trunk/src/VBox/Devices/Makefile.kmk (modified) (5 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -1281 +1281 @@
   TEMPLATE_VBoxDDR0OldGCC_CXXFLAGS = $(filter-out -pedantic,$(TEMPLATE_$(TEMPLATE_VBoxDDR0OldGCC_EXTENDS)_CXXFLAGS))
 
-  VBoxDDR0_TEMPLATE       = VBoxDDR0OldGCC
+  VBoxDDR0_TEMPLATE     := VBoxDDR0OldGCC
  else
-  VBoxDDR0_TEMPLATE       = VBoxR0
+  VBoxDDR0_TEMPLATE     := VBoxR0
  endif
  VBoxDDR0_DEFS           = \
@@ -1293 +1293 @@
  VBoxDDR0_INCS           = build $(VBOX_GRAPHICS_INCS)
  VBoxDDR0_INCS          += $(VBOX_PATH_VMSVGA_DEVICE_INC)
- VBoxDDR0_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+ VBoxDDR0_SDKS.win       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
  VBoxDDR0_SOURCES        = \
         build/VBoxDDR0.cpp \
@@ -1460 +1460 @@
         $(VBOX_LIB_SUPR0)
 
- $(call VBOX_SET_VER_INFO_R0,VBoxDDR0,VirtualBox VMM Devices and Drivers$(COMMA) ring-0) # (last!)
+ ifdef VBOX_WITH_R0_MODULES
+  $(call VBOX_SET_VER_INFO_R0,VBoxDDR0,VirtualBox VMM Devices and Drivers$(COMMA) ring-0) # (last!)
+ endif
 
  ifdef VBOX_WITH_KMOD_WRAPPED_R0_MODS
@@ -1595 +1597 @@
   VBoxPciRawR0_TEMPLATE     = VBoxR0ExtPackPuel
   VBoxPciRawR0_SOURCES      = Bus/DevPciRaw.cpp
-  $(call VBOX_SET_VER_INFO_R0,VBoxPciRawR0,PUEL Extension Pack - PCI Passthrough Driver$(COMMA) ring-0)
+  ifdef VBOX_WITH_R0_MODULES
+   $(call VBOX_SET_VER_INFO_R0,VBoxPciRawR0,PUEL Extension Pack - PCI Passthrough Driver$(COMMA) ring-0)
+  endif
 
   Bus/DevPciRaw.cpp_INCS    = Bus
@@ -1631 +1635 @@
         $(VBoxNvmeR0_0_OUTDIR)/VBoxNvmeR0.debug=>VBoxNvmeR0.debug
    endif
-  endif
+  endif # VBOX_WITH_R0_MODULES
 
   ifdef VBOX_WITH_RAW_MODE