Changeset 706 in kBuild

Timestamp:

Dec 10, 2006 9:57:53 PM (18 years ago)

Author:

bird

Message:

Fixed some x86.win* & amd64.win* leftovers.

Location:

trunk/kBuild/tools

Files:

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

trunk/kBuild/tools/VCC80.kmk

@@ -30 +30 @@
 ifndef PATH_TOOL_VCC80
  PATH_TOOL_VCC80 := $(wildcard $(PATH_DEVTOOLS_TRG)/vcc/v8 \
-                               $(PATH_DEVTOOLS)/x86.win/vcc/v8 \
+                               $(PATH_DEVTOOLS)/win.x86/vcc/v8 \
                                $(PATH_DEVTOOLS)/x86.win32/vcc/v8 \
-                               $(PATH_DEVTOOLS)/amd64.win/vcc/v8)
+                               $(PATH_DEVTOOLS)/win.amd64/vcc/v8)
  ifeq ($(PATH_TOOL_VCC80),)
   PATH_TOOL_VCC80 := $(firstword $(PATH_TOOL_VCC80))
@@ -65 +65 @@
  TOOL_VCC80_LD  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/link.exe
  TOOL_VCC80_MT  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN.x86)/mt.exe
-else 
+else
  # Pathless, relies on the environment.
  TOOL_VCC80_CC  ?= $(EXEC_X86_WIN32) cl.exe

trunk/kBuild/tools/VCC80AMD64.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef PATH_TOOL_VCC80AMD64
- PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/amd64.win/vcc/v8)
+ PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8)
  ifeq ($(PATH_TOOL_VCC80AMD64),)
-  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/x86.win/vcc/v8)
+  PATH_TOOL_VCC80AMD64 := $(PATH_TOOL_VCC80)
+ endif
+ ifeq ($(PATH_TOOL_VCC80AMD64),)
+  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8)
  endif
  ifeq ($(PATH_TOOL_VCC80AMD64),)
@@ -40 +43 @@
  else
   $(warning kBuild: PATH_TOOL_VCC80AMD64 cannot be determined!)
-  PATH_TOOL_VCC80AMD64 := $(PATH_DEVTOOLS)/x86.win/vcc/v8
+  PATH_TOOL_VCC80AMD64 := $(PATH_DEVTOOLS)/win.x86/vcc/v8
  endif
 else

trunk/kBuild/tools/VCC80X86.kmk

@@ -29 +29 @@
 # Tool Specific Properties
 ifndef PATH_TOOL_VCC80X86
- PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/x86.win/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)
+ endif
+ ifeq ($(PATH_TOOL_VCC80X86),)
+  PATH_TOOL_VCC80X86 := $(wildcard $(PATH_DEVTOOLS)/win.amd64/vcc/v8)
  endif
  ifneq ($(PATH_TOOL_VCC80X86),)

trunk/kBuild/tools/XGCCAMD64LINUX.kmk

@@ -42 +42 @@
      TOOL_XGCCAMD64LINUX_EXEC_PREFIX ?= $(EXEC_X86_WIN32)
      TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE := .exe
-     PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win/x86_64-unknown-linux-gnu/*))
+     PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(PATH_DEVTOOLS)/win.x86/x86_64-unknown-linux-gnu/*))
      ifeq ($(PATH_TOOL_XGCCAMD64LINUX),)
       PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(PATH_DEVTOOLS)/x86.win32/x86_64-unknown-linux-gnu/*))