Changeset 667 for trunk/kBuild/tools/NASM.kmk

Timestamp:

Dec 6, 2006, 5:00:16 AM (19 years ago)

Author:

bird

Message:

cleanup. PATH_DEV* -> PATH_DEVTOOLS*.

File:

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

trunk/kBuild/tools/NASM.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild Tool Config - NASM     0.98 or later.
+# kBuild Tool Config - Netwide Assembler v0.98+.
 #
-# Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
+# Copyright (c) 2004-2006 knut st. osmundsen <bird-srcspam@anduin.net>
 #
 #
@@ -25 +25 @@
 #
 
+TOOL_NASM := Netwide Assembler v0.98+
 
-TOOL_NASM                     := Netwide Assembler 0.98+
+# Tool Specific Properties
 ifndef PATH_TOOL_NASM
- PATH_DEV_BLD                 ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
- PATH_TOOL_NASM               := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/nasm/v*.*))
+ PATH_TOOL_NASM := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/nasm/v*.*))
  ifneq ($(PATH_TOOL_NASM),)
-  PATH_TOOL_NASM              := $(call lastword,$(PATH_TOOL_NASM))
+  PATH_TOOL_NASM := $(call lastword,$(PATH_TOOL_NASM))
  endif
+else
+ # Resolve any fancy stuff once and for all.
+ PATH_TOOL_NASM := $(PATH_TOOL_NASM)
 endif
 
 ifneq ($(PATH_TOOL_NASM),)
- TOOL_NASM_AS                 ?= $(PATH_TOOL_NASM)/nasm$(HOSTSUFF_EXE)
+ TOOL_NASM_AS ?= $(PATH_TOOL_NASM)/nasm$(HOSTSUFF_EXE)
 else
- TOOL_NASM_AS                 ?= nasm$(HOSTSUFF_EXE)
+ TOOL_NASM_AS ?= nasm$(HOSTSUFF_EXE)
 endif
-TOOL_NASM_ASFLAGS             ?=
+
+# General Properties used by kBuild
+TOOL_NASM_ASFLAGS ?=