Changeset 3520 in kBuild

Timestamp:

Dec 18, 2021 1:39:52 PM (3 years ago)

Author:

bird

Message:

NASM.kmk,YASM.kmk: Properly quote includes and defines.

Location:

trunk/kBuild/tools

Files:

• NASM.kmk (modified) (1 diff)
• YASM.kmk (modified) (3 diffs)

trunk/kBuild/tools/NASM.kmk

@@ -81 +81 @@
 ifdef TOOL_NASM_KSUBMIT
         $(QUIET)$(call TOOL_NASM_KSUBMIT, -C $(PATH_OUT_BASE)) $(TOOL_NASM_AS)\
-                $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
+                $(flags) $(qaddsuffix sh,/,$(qaddprefix ,-i, $(incs))) $(qaddprefix sh,-D, $(defs))\
                 -l $(outbase).lst\
                 -o $(obj)\
                 -MD "$(dep)" -MP\
-                $(abspath $(source))
+                $(qabspath sh,$(source))
 else
         $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -- $(TOOL_NASM_AS)\
-                $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
+                $(flags) $(qaddsuffix sh,/,$(qaddprefix ,-i, $(incs))) $(qaddprefix sh,-D, $(defs))\
                 -l $(outbase).lst\
                 -o $(obj)\
                 -MD "$(dep)" -MP\
-                $(abspath $(source))
+                $(qabspath sh,$(source))
 endif
 endef

trunk/kBuild/tools/YASM.kmk

@@ -82 +82 @@
         $(QUIET)$(TOOL_YASM_KSUBMIT) $(TOOL_YASM_AS)\
                 $(patsubst --mapfile%,--mapfile=$(obj).map,$(flags))\
-                $(addsuffix /,$(addprefix -I, $(incs))) $(addprefix -D, $(defs))\
-                -l $(outbase).lst\
-                -o $(obj)\
+                $(addsuffix /,$(qaddprefix sh,-I, $(incs))) $(qaddprefix sh,-D, $(defs))\
+                -l $(outbase).lst \
+                -o $(obj) \
                 -MD="$(dep)" -MP --makedep-dos2unix-slash\
                 $(abspath $(source))
@@ -90 +90 @@
         $(QUIET)$(TOOL_YASM_AS)\
                 $(patsubst --mapfile%,--mapfile=$(obj).map,$(flags))\
-                $(addsuffix /,$(addprefix -I, $(incs))) $(addprefix -D, $(defs))\
+                $(addsuffix /,$(qaddprefix sh,-I, $(incs))) $(qaddprefix sh,-D, $(defs))\
                 -l $(outbase).lst\
                 -o $(obj)\
@@ -96 +96 @@
         $(QUIET)$(REDIRECT) -wo $(dep) -- $(TOOL_YASM_AS) -DKBUILD_GENERATING_MAKEFILE_DEPENDENCIES\
                 $(patsubst --mapfile%,--mapfile=$(obj).map,$(flags))\
-                $(addsuffix /,$(addprefix -I, $(incs))) $(addprefix -D, $(defs))\
-                -o $(obj) \
+                $(addsuffix /,$(qaddprefix sh,-I, $(incs))) $(qaddprefix sh,-D, $(defs))\
+                -o $(obj)\
                 $(abspath $(source)) \
                 -M