Changeset 5898 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Dec 2, 2007 6:08:26 AM (17 years ago)

Author:

vboxsync

Message:

kBuild 0.1.2 preps: Avoid the shell at all costs because cygwin is messing up on smp boxes and screwing up the tinderbox.

File:

• trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk (modified) (3 diffs)

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -63 +63 @@
 $(PATH_TARGET)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c $(PATH_SUB_CURRENT)/apmbios.S | $(call DIRDEP,$(TARGET_PATH))
         $(call MSG_TOOL,cpp,PcBiosBin,$<,$@)
+ifdef KMK_USE_REDIRECT
+        $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -P -o $@ $<
+else
         $(QUIET)$(TOOL_$(VBOX_GCC_TOOL)_CC) -E -I$(PATH_TARGET) -I$(VBOX_PATH_DEVICES_SRC)/PC -I$(PATH_ROOT)/include -I$(PATH_OUT) -DBX_SMP_PROCESSORS=1 -DVBOX $(addprefix -D,$(DEFS) $(DEFS.$(BUILD_TYPE))) -P $< > $@
+endif
 
 # 2. compile to intermediate asm file - tempfile clashes, make sure it's built alone.
@@ -74 +78 @@
 $(PATH_TARGET)/rombios1.s: $(PATH_TARGET)/rombios0.s
         $(call MSG_TOOL,Adjusting BCC Assembly,PcBiosBin,$<,$@)
+ifdef KMK_NEW_SED
+        $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' --output $@ $^
+else
         $(QUIET)$(SED) -e 's/^\.text//' -e 's/^\.data//' $^ > $@
+endif
 
 # 4. assemble the intermediate asm file. (also creates a listing rombios.lst)
 $(PATH_TARGET)/pcbios.tmp $(PATH_TARGET)/pcbios.lst: $(PATH_TARGET)/rombios1.s
         $(call MSG_COMPILE,PcBiosBin,$<,$@,AS)
-        $(QUIET)$(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst - < $^
+ifdef KMK_USE_REDIRECT
+        $(QUIET)$(REDIRECT) -ri $^ -- $(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst
+else
+        $(QUIET)$(VBOX_AS86) -b $(PATH_TARGET)/pcbios.tmp -u- -w- -g -0 -j -O -l $(PATH_TARGET)/pcbios.lst < $^
+endif
 
 # 5. calculate checksums for the final BIOS image.
@@ -90 +102 @@
 $(PATH_TARGET)/pcbios-syms.h: $(PATH_TARGET)/pcbios.lst $(MAKEFILE_CURRENT)
         $(call MSG_GENERATE,PcBiosBin,$<,$@)
+ifdef KMK_NEW_SED
+        $(QUIET)$(SED) \
+                -e  '/^[0-9][0-9][0-9][0-9][0-9]                       000[0-9A-F]*            [[:space:]]*[a-zA-Z0-9_]*:/!d' \
+                -e 's/^[0-9][0-9][0-9][0-9][0-9]                       \(000[0-9A-F]*\)            [[:space:]]*\([a-zA-Z0-9_]*\):.*$$/    DEFSYM(0x\1, "\2"),/' \
+                --output $@ \
+                $(PATH_TARGET)/pcbios.lst 
+else
         $(QUIET)$(SED) \
                 -e  '/^[0-9][0-9][0-9][0-9][0-9]                       000[0-9A-F]*            [[:space:]]*[a-zA-Z0-9_]*:/!d' \
                 -e 's/^[0-9][0-9][0-9][0-9][0-9]                       \(000[0-9A-F]*\)            [[:space:]]*\([a-zA-Z0-9_]*\):.*$$/    DEFSYM(0x\1, "\2"),/' \
                 $(PATH_TARGET)/pcbios.lst > $@
+endif