Changeset 857 in kBuild for trunk

Timestamp:

Mar 28, 2007 10:36:57 PM (18 years ago)

Author:

bird

Message:

Select v8*.

Location:

trunk/kBuild/tools

Files:

• VCC80.kmk (modified) (1 diff)
• VCC80AMD64.kmk (modified) (2 diffs)
• VCC80X86.kmk (modified) (1 diff)

trunk/kBuild/tools/VCC80.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef PATH_TOOL_VCC80
- PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS_TRG)/vcc/v8 \
-                               $(PATH_DEVTOOLS)/win.x86/vcc/v8 \
-                               $(PATH_DEVTOOLS)/x86.win32/vcc/v8 \
-                               $(PATH_DEVTOOLS)/win.amd64/vcc/v8)
+ PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS_TRG)/vcc/v8*)
  ifeq ($(PATH_TOOL_VCC80),)
-  PATH_TOOL_VCC80 := $(firstword $(PATH_TOOL_VCC80))
+  PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
+ endif
+ ifeq ($(PATH_TOOL_VCC80),)
+  PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8*)
+ endif
+ ifeq ($(PATH_TOOL_VCC80),)
+  PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v8*)
+ endif
+ ifeq ($(PATH_TOOL_VCC80),)
+  PATH_TOOL_VCC80 := $(lastword $(sort $(PATH_TOOL_VCC80)))
  endif
  # if not found, we'll enter 'pathless' mode.

trunk/kBuild/tools/VCC80AMD64.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef PATH_TOOL_VCC80AMD64
- PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8)
+ PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
  ifeq ($(PATH_TOOL_VCC80AMD64),)
   PATH_TOOL_VCC80AMD64 := $(PATH_TOOL_VCC80)
@@ -37 +37 @@
  endif
  ifeq ($(PATH_TOOL_VCC80AMD64),)
-  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8)
+  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
  endif
  ifneq ($(PATH_TOOL_VCC80AMD64),)
-  # done for now
+  PATH_TOOL_VCC80AMD64 := $(lastword $(sort $(PATH_TOOL_VCC80AMD64)))
  else
   $(warning kBuild: PATH_TOOL_VCC80AMD64 cannot be determined!)

trunk/kBuild/tools/VCC80X86.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef PATH_TOOL_VCC80X86
- PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8)
+ PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8*)
  ifeq ($(PATH_TOOL_VCC80X86),)
   PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80)
  endif
  ifeq ($(PATH_TOOL_VCC80X86),)
-  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8)
+  PATH_TOOL_VCC80X86 := $(PATH_TOOL_VCC80AMD64)
  endif
  ifeq ($(PATH_TOOL_VCC80X86),)
-  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v8)
+  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8*)
+ endif
+ ifeq ($(PATH_TOOL_VCC80X86),)
+  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v8*)
  endif
  ifneq ($(PATH_TOOL_VCC80X86),)
-  # done for now
+  PATH_TOOL_VCC80X86 := $(lastword $(sort $(PATH_TOOL_VCC80X86)))
  else
   $(warning kBuild: PATH_TOOL_VCC80X86 cannot be determined!)