vbox的更動 10043 路徑 trunk/src/VBox/Devices/PC

時間撮記:

2008-6-30 下午11:54:38 (16 年 以前)

作者:

vboxsync

訊息:

Fixed a couple of wrong deps (TARGET_PATH instead of PATH_TARGET, missing double expansion of TARGET_vbetables-gen in rule dependency). Rewrote the bcc temp file workaround to not use .NOTPARALLEL as that is wasting time in a parallel build.

檔案:

• trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk (修改) (2 筆差異)

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

@@ -20 +20 @@
 #
 
-DEPTH ?= ../../../../../
+ifdef VBOX_KBUILD_HACKING
+SUB_DEPTH = ../../../../..
+else
 SUB_DEPTH = ../..
+DEPTH    ?= ../../../../..
+endif
 include $(KBUILD_PATH)/subheader.kmk
 
-VBOX_PATH_DEVICES_SRC = $(PATH_SUB_ROOT)
+VBOX_PATH_DEVICES_SRC ?= $(PATH_ROOT)/src/VBox/Devices
 
 #
@@ -66 +70 @@
 # 1. precompile rombios.c
 $(PATH_TARGET)/_rombios_.c: $(PATH_SUB_CURRENT)/rombios.c $(PATH_SUB_CURRENT)/logo.c $(PATH_SUB_CURRENT)/apmbios.S \
-                $(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h | $(call DIRDEP,$(TARGET_PATH))
+                $(PATH_SUB_CURRENT)/../DevPcBios.h $(PATH_ROOT)/include/VBox/bioslogo.h | $(call DIRDEP,$(PATH_TARGET))
         $(call MSG_TOOL,cpp,PcBiosBin,$<,$@)
         $(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 -DVBOX_PC_BIOS $(addprefix -D,$(DEFS) $(DEFS.$(KBUILD_TYPE))) -P -o $@ $<
 
-# 2. compile to intermediate asm file - tempfile clashes, make sure it's built alone.
-.NOTPARALLEL: $(PATH_TARGET)/rombios0.s
-$(PATH_TARGET)/rombios0.s: $(PATH_TARGET)/_rombios_.c
+# 2. compile to intermediate asm file.
+# BCC tempfile clashes, order the BCC jobs to make sure they don't interfere with one another.
+$(PATH_TARGET)/rombios0.s: $(PATH_TARGET)/_rombios_.c | $(VBOX_BCC_JOBS)
         $(call MSG_COMPILE,PcBiosBin,$<,$@,C)
         $(QUIET)$(VBOX_BCC) -o $@ -C-c -D__i86__ -0 -S $^
+VBOX_BCC_JOBS += $(PATH_TARGET)/rombios0.s
 
 # 3. post process intermediate asm file.