Changeset 2808 in kBuild

Timestamp:

Jan 30, 2016 3:13:32 PM (9 years ago)

Author:

bird

Message:

tools/NASM.kmk: Look for nasm in the alternative host tools directory too. Must change directory when generating dependencies so nasm doesn't skip the full path for files in the current directory. Also generate dummy dep lines to avoid rename issues.

File:

• trunk/kBuild/tools/NASM.kmk (modified) (2 diffs)

trunk/kBuild/tools/NASM.kmk

@@ -36 +36 @@
 # Tool Specific Properties
 ifndef PATH_TOOL_NASM
- PATH_TOOL_NASM := $(sort $(wildcard $(KBUILD_DEVTOOLS_HST)/nasm/v*.*))
- ifneq ($(PATH_TOOL_NASM),)
-  PATH_TOOL_NASM := $(call lastword,$(PATH_TOOL_NASM))
+ PATH_TOOL_NASM := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/nasm/v*.*)))
+ if "$(PATH_TOOL_NASM)" == "" && "$(KBUILD_DEVTOOLS_HST_ALT)" != ""
+  PATH_TOOL_NASM := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/nasm/v*.*)))
  endif
 else
@@ -77 +77 @@
                 -o $(obj)\
                 $(abspath $(source))
-        $(QUIET)$(REDIRECT) -wo $(dep) -- $(TOOL_NASM_AS) -DKBUILD_GENERATING_MAKEFILE_DEPENDENCIES\
+        $(QUIET)$(REDIRECT) -C $(PATH_OUT_BASE) -wo $(dep) -- $(TOOL_NASM_AS) -DKBUILD_GENERATING_MAKEFILE_DEPENDENCIES\
                 $(flags) $(addsuffix /,$(addprefix -i, $(incs))) $(addprefix -D, $(defs))\
                 -l $(outbase).lst\
                 -o $(obj)\
                 $(abspath $(source)) \
-                -M
+                -M -MP
 endef