Changeset 3520 for trunk/kBuild/tools/YASM.kmk

Timestamp:

Dec 18, 2021, 2:39:52 PM (4 years ago)

Author:

bird

Message:

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

File:

• trunk/kBuild/tools/YASM.kmk (modified) (3 diffs)

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