Changeset 107043 in vbox for trunk/src/VBox/Devices/EFI/Firmware

Timestamp:

Nov 19, 2024 12:16:53 PM (3 months ago)

Author:

vboxsync

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

165994

Message:

EFI/Firmware: Fix packing. jiraref:VBP-1458

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/EFI/Firmware/Config.kmk

@@ -194 +194 @@
 # The debug info suffix.
 #
-if1of ($(KBUILD_TARGET), win)
- VBOX_EFI_DBG_SUFF := .pdb
-else
- VBOX_EFI_DBG_SUFF := .debug
+if1of ($(VBOX_EFI_TOOL_CHAIN.x86), VS2017 VS2019 VS2022 CLANGPDB)
+ VBOX_EFI_DBG_SUFF.x86   := .pdb
+else
+ VBOX_EFI_DBG_SUFF.x86   := .debug
+endif
+if1of ($(VBOX_EFI_TOOL_CHAIN.amd64), VS2017 VS2019 VS2022 CLANGPDB)
+ VBOX_EFI_DBG_SUFF.amd64 := .pdb
+else
+ VBOX_EFI_DBG_SUFF.amd64 := .debug
+endif
+if1of ($(VBOX_EFI_TOOL_CHAIN.arm32), VS2017 VS2019 VS2022 CLANGPDB)
+ VBOX_EFI_DBG_SUFF.arm32 := .pdb
+else
+ VBOX_EFI_DBG_SUFF.arm32 := .debug
+endif
+if1of ($(VBOX_EFI_TOOL_CHAIN.arm64), VS2017 VS2019 VS2022 CLANGPDB)
+ VBOX_EFI_DBG_SUFF.arm64 := .pdb
+else
+ VBOX_EFI_DBG_SUFF.arm64 := .debug
 endif
 

trunk/src/VBox/Devices/EFI/Firmware/Makefile.kmk

@@ -222 +222 @@
                 VBoxEFI64.fd
         $(REDIRECT) -C "$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X $@ \
-                $(foreach mod,$(VBOX_EFI_MODULES_FLAT_X86),amd64/$(mod)$(VBOX_EFI_DBG_SUFF)) \
-                $(foreach mod,$(VBOX_EFI_MODULES_FLAT_X86),x86/$(mod)$(VBOX_EFI_DBG_SUFF))
+                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.amd64),amd64/$(mod)$(VBOX_EFI_DBG_SUFF.amd64)) \
+                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.x86),x86/$(mod)$(VBOX_EFI_DBG_SUFF.x86))
 
 ifdef VBOX_WITH_VIRT_ARMV8
@@ -232 +232 @@
                 VBoxEFIAArch64.fd
         $(REDIRECT) -C "$(PATH_STAGE)/$(INST_VBOXDBG_SYMS)" -- $(TOOL_ZIP_PACK) $(TOOL_ZIP_PACKFLAGS) -9X $@ \
-                $(foreach mod,$(VBOX_EFI_MODULES_FLAT_ARM),aarch64/$(mod)$(VBOX_EFI_DBG_SUFF)) \
-                $(foreach mod,$(VBOX_EFI_MODULES_FLAT_ARM),aarch32/$(mod)$(VBOX_EFI_DBG_SUFF))
+                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm64),aarch64/$(mod)$(VBOX_EFI_DBG_SUFF.arm64)) \
+                $(foreach mod,$(VBOX_EFI_MODULES_FLAT.arm32),aarch32/$(mod)$(VBOX_EFI_DBG_SUFF.arm32))
 endif