Changeset 650

Timestamp:

Dec 4, 2006, 12:41:26 AM (19 years ago)

Author:

bird

Message:

PATH_DEV -> PATH_DEV_BLD w/ compatability hack.

Location:

trunk/kBuild/tools

Files:

• ALP.kmk (modified) (1 diff)
• MINGW32.kmk (modified) (1 diff)
• NASM.kmk (modified) (1 diff)
• XGCCAMD64LINUX.kmk (modified) (1 diff)
• YASM.kmk (modified) (1 diff)

trunk/kBuild/tools/ALP.kmk

@@ -28 +28 @@
 TOOL_ALP                     := IBM Assembly Language Processor
 #ifndef PATH_TOOL_ALP
-#PATH_TOOL_ALP                := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/alp/v*.*))
+#PATH_TOOL_ALP                := $(sort $(wildcard $(PATH_DEV_BLD)/alp/v*.*))
 #ifneq ($(PATH_TOOL_ALP),)
 #PATH_TOOL_ALP                := $(call lastword,$(PATH_TOOL_ALP))

trunk/kBuild/tools/MINGW32.kmk

@@ -29 +29 @@
 # find latest installed version
 ifndef PATH_TOOL_MINGW32
-PATH_TOOL_MINGW32            := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/mingw32/v*.*))
+PATH_DEV_BLD                 ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
+PATH_TOOL_MINGW32            := $(sort $(wildcard $(PATH_DEV_BLD)/mingw32/v*.*))
 ifeq ($(PATH_TOOL_MINGW32),)
 PATH_TOOL_MINGW32            := $(sort $(wildcard $(PATH_DEV)/x86.win32/mingw32/v*.*))

trunk/kBuild/tools/NASM.kmk

@@ -28 +28 @@
 TOOL_NASM                     := Netwide Assembler 0.98+
 ifndef PATH_TOOL_NASM
-PATH_TOOL_NASM                := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/nasm/v*.*))
+PATH_DEV_BLD                  ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
+PATH_TOOL_NASM                := $(sort $(wildcard $(PATH_DEV_BLD)/nasm/v*.*))
 ifneq ($(PATH_TOOL_NASM),)
 PATH_TOOL_NASM                := $(call lastword,$(PATH_TOOL_NASM))

trunk/kBuild/tools/XGCCAMD64LINUX.kmk

@@ -40 +40 @@
 _TOOL_XGCCAMD64LINUX_PREFIX            := x86_64-unknown-linux-gnu-
 ifndef PATH_TOOL_XGCCAMD64LINUX
-PATH_TOOL_XGCCAMD64LINUX               := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/x86_64-unknown-linux-gnu/*))
+PATH_DEV_BLD                           ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
+PATH_TOOL_XGCCAMD64LINUX               := $(sort $(wildcard $(PATH_DEV_BLD)/x86_64-unknown-linux-gnu/*))
 ifeq ($(filter-out win64,$(BUILD_PLATFORM)),) # these can use the windows build.
 _TOOL_XGCCAMD64LINUX_EXEC_PREFIX       := $(EXEC_X86_WIN32)

trunk/kBuild/tools/YASM.kmk

@@ -28 +28 @@
 TOOL_YASM                     := Yasm, the modular assembler v0.4.0+
 ifndef PATH_TOOL_YASM
-PATH_TOOL_YASM                := $(sort $(wildcard $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)/yasm/v*.*))
+PATH_DEV_BLD                  ?= $(PATH_DEV)/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
+PATH_TOOL_YASM                := $(sort $(wildcard $(PATH_DEV_BLD)/yasm/v*.*))
 ifneq ($(PATH_TOOL_YASM),)
 PATH_TOOL_YASM                := $(call lastword,$(PATH_TOOL_YASM))