Changeset 2692 for trunk/kBuild

Timestamp:

Jul 22, 2013, 3:31:00 PM (12 years ago)

Author:

bird

Message:

Not quite as simple. Only bin and dosexe formats supports map files. Leave it to the user by replacing all attempts at using --mapfile.

File:

• trunk/kBuild/tools/YASM.kmk (modified) (1 diff)

trunk/kBuild/tools/YASM.kmk

@@ -67 +67 @@
 # @param    $(objsuff)  Object suffix.
 #
-TOOL_YASM_COMPILE_AS_OUTPUT = $(outbase).lst $(obj).map
+TOOL_YASM_COMPILE_AS_OUTPUT = $(outbase).lst
+TOOL_YASM_COMPILE_AS_OUTPUT_MAYBE = $(obj).map
 TOOL_YASM_COMPILE_AS_DEPEND =
 TOOL_YASM_COMPILE_AS_DEPORD =
 define TOOL_YASM_COMPILE_AS_CMDS
         $(QUIET)$(TOOL_YASM_AS)\
-                $(flags) $(addsuffix /,$(addprefix -I, $(incs))) $(addprefix -D, $(defs))\
+                $(patsubst --mapfile%,--mapfile=$(obj).map,$(flags))\
+                $(addsuffix /,$(addprefix -I, $(incs))) $(addprefix -D, $(defs))\
                 -l $(outbase).lst\
-                --mapfile=$(obj).map\
                 -o $(obj)\
                 $(abspath $(source))