Devices

Timestamp:

Jun 25, 2020 4:30:42 PM (4 years ago)

Author:

vboxsync

Message:

Devices: Use TOOL_YASM_AS at various places; helps cross-building (WSL).

Location:

trunk/src/VBox/Devices

Files:

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

r84676	r84957
44	44
45	45	# VBox Yasm command
	46	## @todo r=andy Is this still needed? Or can we just use TOOL_YASM_AS?
46	47	VBOX_YASMCMD ?= $(firstword $(wildcard $(KBUILD_DEVTOOLS_HST)/bin/yasm$(HOSTSUFF_EXE)) yasm$(HOSTSUFF_EXE))
47	48

-              r82968
+              r84957
                --bios-type vga \
                 --output $$(VBoxVgaBios$(1)_0_OUTDIR)/VBoxVgaBiosAlternative$(1).asm
         $$(QUIET)yasm -f bin \
+        $$(QUIET)$$(TOOL_YASM_AS) -f bin \
                 -o $$(VBoxVgaBios$(1)_0_OUTDIR)/VBoxVgaBiosAlternative$(1).bin \
                 -l $$(VBoxVgaBios$(1)_0_OUTDIR)/VBoxVgaBiosAlternative$(1).lst \
 …
                 $$(VBOX_BIN2C) | $$$$(dir $$$$@)
         $$(call MSG_TOOL,bin2c,VgaBiosBin,$$<,$$@)
         $$(QUIET)yasm -f bin -o $$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom $$<
+        $$(QUIET)$$(TOOL_YASM_AS) -f bin -o $$(VgaBiosBin_0_OUTDIR)/VBoxVgaBios$(1).rom $$<
         $$(QUIET)$$(REDIRECT) -C $$(VgaBiosBin_0_OUTDIR) -- \
                 $$(MD5SUM_EXT) -c $$(basename $$<).md5sum
 …
 include $(FILE_KBUILD_SUB_FOOTER)

-              r82968
+              r84957
         --bios-type system \
         --output $$(VBoxPcBios$(1)_0_OUTDIR)/VBoxBiosAlternative$(1).asm
         $$(QUIET)yasm -f bin -o $$(VBoxPcBios$(1)_0_OUTDIR)/VBoxBiosAlternative$(1).bin $$(VBoxPcBios$(1)_0_OUTDIR)/VBoxBiosAlternative$(1).asm
+        $$(QUIET)$$(TOOL_YASM_AS) -f bin -o $$(VBoxPcBios$(1)_0_OUTDIR)/VBoxBiosAlternative$(1).bin $$(VBoxPcBios$(1)_0_OUTDIR)/VBoxBiosAlternative$(1).asm
         $$(VBOX_VBOXCMP) $$< $$(VBoxPcBios$(1)_0_OUTDIR)/VBoxBiosAlternative$(1).bin
         $$(CP) --changed -- $$(VBoxPcBios$(1)_0_OUTDIR)/VBoxBiosAlternative$(1).asm $$(PATH_ROOT)/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative$(1).asm
 …
                 $$(VBOX_BIN2C) | $$$$(dir $$$$@)
         $$(call MSG_TOOL,bin2c,PcBiosBin,$$<,$$@)
         $$(QUIET)yasm -f bin -o $$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom $$<
+        $$(QUIET)$$(VBOX_YASM) -f bin -o $$(PcBiosBin_0_OUTDIR)/VBoxPcBios$(1).rom $$<
         $$(QUIET)$$(REDIRECT) -C $$(PcBiosBin_0_OUTDIR) -- \
                 $$(MD5SUM_EXT) -c $$(basename $$<).md5sum
 …
 include $(FILE_KBUILD_SUB_FOOTER)

Note: See TracChangeset for help on using the changeset viewer.