Changeset 2873 in kBuild

Timestamp:

Sep 4, 2016 7:13:12 PM (8 years ago)

Author:

bird

Message:

updates

Location:

trunk/kBuild/tools

Files:

• NASM.kmk (modified) (2 diffs)
• YASM.kmk (modified) (2 diffs)

trunk/kBuild/tools/NASM.kmk

@@ -51 +51 @@
 endif
 
+# kSubmit
+ifdef TOOL_NASM_USE_KSUBMIT
+ ifeq ($(KBUILD_HOST),win)
+  TOOL_NASM_KSUBMIT ?= kmk_builtin_kSubmit $1 --
+ endif
+endif
+
 # General Properties used by kBuild
 TOOL_NASM_ASFLAGS ?=
@@ -72 +79 @@
 TOOL_NASM_COMPILE_AS_DEPORD =
 define TOOL_NASM_COMPILE_AS_CMDS
-        $(QUIET)$(TOOL_NASM_AS)\
+ifdef TOOL_NASM_KSUBMIT
+        $(QUIET)$(call TOOL_NASM_KSUBMIT, -C $(PATH_OUT_BASE)) $(TOOL_NASM_AS)\
                 $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
                 -l $(outbase).lst\
                 -o $(obj)\
                 $(abspath $(source))
-        $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -wo $(dep) -- $(TOOL_NASM_AS) -DKBUILD_GENERATING_MAKEFILE_DEPENDENCIES\
+        $(QUIET)$(call TOOL_NASM_KSUBMIT, -C $(PATH_OUT_BASE)) $(TOOL_NASM_AS) -DKBUILD_GENERATING_MAKEFILE_DEPENDENCIES\
                 $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
                 -l $(outbase).lst\
                 -o $(obj)\
                 $(abspath $(source)) \
-                -M -MP
+                -MF "$(dep)" -MP
+else
+        $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) $(TOOL_NASM_AS)\
+                $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
+                -l $(outbase).lst\
+                -o $(obj)\
+                $(abspath $(source))
+        $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -- $(TOOL_NASM_AS) -DKBUILD_GENERATING_MAKEFILE_DEPENDENCIES\
+                $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
+                -l $(outbase).lst\
+                -o $(obj)\
+                $(abspath $(source)) \
+                -MF "$(dep)" -MP
+endif
 endef
 

trunk/kBuild/tools/YASM.kmk

@@ -50 +50 @@
 endif
 
+# kSubmit
+ifdef TOOL_YASM_USE_KSUBMIT
+ ifeq ($(KBUILD_HOST),win)
+  TOOL_YASM_KSUBMIT ?= kmk_builtin_kSubmit --
+ endif
+endif
+
 # General Properties used by kBuild
 TOOL_YASM_ASFLAGS ?=
@@ -72 +79 @@
 TOOL_YASM_COMPILE_AS_DEPORD =
 define TOOL_YASM_COMPILE_AS_CMDS
-        $(QUIET)$(TOOL_YASM_AS)\
+        $(QUIET)$(TOOL_YASM_KSUBMIT) $(TOOL_YASM_AS)\
                 $(patsubst --mapfile%,--mapfile=$(obj).map,$(flags))\
                 $(addsuffix /,$(addprefix -I, $(incs))) $(addprefix -D, $(defs))\