Changeset 63758 in vbox for trunk/src/VBox/ValidationKit/bootsectors

Timestamp:

Sep 7, 2016 11:41:54 PM (9 years ago)

Author:

vboxsync

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

110564

Message:

bootsectors/Config.kmk: Use the -MD nasm option, avoiding the 2nd dependency invocation.

File:

• trunk/src/VBox/ValidationKit/bootsectors/Config.kmk (modified) (11 diffs)

trunk/src/VBox/ValidationKit/bootsectors/Config.kmk

@@ -190 +190 @@
 #
 
+ifdef VBOX_USE_KSUBMIT
+ VBOX_BS3KIT_KSUBMIT_OBJ_CONV := kmk_builtin_kSubmit --
+else
+ VBOX_BS3KIT_KSUBMIT_OBJ_CONV :=
+endif
+
 # Dummy CP "linker" tool.
 TOOL_VBoxBsCpLd = Dummy copy linker.
@@ -234 +240 @@
                 -l $(outbase).lst\
                 -o $(obj)\
+               -MD "$(dep)" -MP\
                 $(abspath $(source))
-        $(QUIET)kmk_builtin_kSubmit -C $(PATH_OUT_BASE) -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-        $(QUIET)kmk_builtin_kSubmit -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasm_AS)\
-                $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
-                -l $(outbase).lst\
-                -o $(obj)\
-                $(abspath $(source)) \
-                -MF "$(dep)" -MP
 else
         $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -- $(TOOL_VBoxNasm_AS)\
@@ -247 +247 @@
                 -l $(outbase).lst\
                 -o $(obj)\
+               -MD "$(dep)" -MP\
                 $(abspath $(source))
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-        $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -wo $(dep) -- $(TOOL_VBoxNasm_AS)\
-                $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
-                -l $(outbase).lst\
-                -o $(obj)\
-                $(abspath $(source)) \
-                -MF "$(dep)" -MP
-endif
+endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
 endef
 
@@ -297 +292 @@
                 -o $(obj)\
                 $(abspath $(source))
-ifdef VBOX_USE_KSUBMIT
-        $(QUIET)kmk_builtin_kSubmit -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-else
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
@@ -337 +328 @@
                 -o $(obj)\
                 $(abspath $(source))
-ifdef VBOX_USE_KSUBMIT
-        $(QUIET)kmk_builtin_kSubmit -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-else
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
         $(QUIET)$(APPEND) -n "$(dep)" "" "$(source):" ""
 endef
@@ -365 +352 @@
 define TOOL_Bs3Vcc64_COMPILE_C_CMDS
 $(TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_COMPILE_C_CMDS)
-ifdef VBOX_USE_KSUBMIT
-        $(QUIET)kmk_builtin_kSubmit -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-else
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
 endef
 
@@ -402 +385 @@
 define TOOL_Bs3Vcc64_COMPILE_CXX_CMDS
 $(TOOL_$(VBOX_VCC_TOOL_STEM)AMD64_COMPILE_CXX_CMDS)
-ifdef VBOX_USE_KSUBMIT
-        $(QUIET)kmk_builtin_kSubmit -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-else
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
 endef
 
@@ -435 +414 @@
 define TOOL_Bs3Ow32_COMPILE_C_CMDS
 $(TOOL_OPENWATCOM_COMPILE_C_CMDS)
-ifdef VBOX_USE_KSUBMIT
-        $(QUIET)kmk_builtin_kSubmit -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-else
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
         $(QUIET)$(REDIRECT) -wo /dev/null -- $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
 endef
@@ -473 +448 @@
 define TOOL_Bs3Ow32_COMPILE_CXX_CMDS
 $(TOOL_OPENWATCOM_COMPILE_CXX_CMDS)
-ifdef VBOX_USE_KSUBMIT
-        $(QUIET)kmk_builtin_kSubmit -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-else
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
         $(QUIET)$(REDIRECT) -wo /dev/null -- $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
 endef
@@ -503 +474 @@
 define TOOL_Bs3Ow16_COMPILE_C_CMDS
 $(TOOL_OPENWATCOM-16_COMPILE_C_CMDS)
-ifdef VBOX_USE_KSUBMIT
-        $(QUIET)kmk_builtin_kSubmit -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-else
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
         $(QUIET)$(REDIRECT) -wo /dev/null -- $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
 endef
@@ -541 +508 @@
 define TOOL_Bs3Ow16_COMPILE_CXX_CMDS
 $(TOOL_OPENWATCOM-16_COMPILE_CXX_CMDS)
-ifdef VBOX_USE_KSUBMIT
-        $(QUIET)kmk_builtin_kSubmit -- $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-else
-        $(QUIET)$(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
-endif
+        $(QUIET)$(VBOX_BS3KIT_KSUBMIT_OBJ_CONV) $(VBoxBs3ObjConverter_1_TARGET) "$(obj)"
         $(QUIET)$(REDIRECT) -wo /dev/null -- $(KBUILD_BIN_PATH)/kDepObj$(HOSTSUFF_EXE) -s -f -q -o "$(dep)" -t "$(obj)" "$(obj)"
 endef