Changeset 848 in kBuild for trunk

Timestamp:

Feb 6, 2007 3:13:07 AM (18 years ago)

Author:

bird

Message:

win.amd64 fixes.

Location:

trunk/kBuild

Files:

• sdks/WIN64SDK.kmk (modified) (2 diffs)
• tools/VCC80AMD64.kmk (modified) (2 diffs)
• tools/XGCCAMD64LINUX.kmk (modified) (2 diffs)

trunk/kBuild/sdks/WIN64SDK.kmk

@@ -35 +35 @@
  endif
  ifeq ($(PATH_SDK_WIN64SDK),)
-  PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/x86.win/sdk/2*)
- endif
- ifeq ($(PATH_SDK_WIN64SDK),)
-  PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/x86.win32/sdk/2*)
+  PATH_SDK_WIN64SDK := $(wildcard $(PATH_DEVTOOLS)/win.x86/sdk/2*)
  endif
  ifneq ($(PATH_SDK_WIN64SDK),)
@@ -55 +52 @@
 
 ifndef PATH_SDK_WIN64SDK_LIB
-PATH_SDK_WIN64SDK_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WIN64SDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WIN64SDK)/Lib/AMD64)
+PATH_SDK_WIN64SDK_LIB := $(firstword $(wildcard $(PATH_SDK_WIN64SDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WIN64SDK)/Lib/AMD64)
 endif
 

trunk/kBuild/tools/VCC80AMD64.kmk

@@ -34 +34 @@
  endif
  ifeq ($(PATH_TOOL_VCC80AMD64),)
-  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8)
+  PATH_TOOL_VCC80AMD64 := $(PATH_TOOL_VCC80X86)
  endif
  ifeq ($(PATH_TOOL_VCC80AMD64),)
-  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/x86.win32/vcc/v8)
+  PATH_TOOL_VCC80AMD64 := $(wildcard $(PATH_DEVTOOLS)/win.x86/vcc/v8)
  endif
  ifneq ($(PATH_TOOL_VCC80AMD64),)
@@ -56 +56 @@
 PATH_TOOL_VCC80AMD64_LIB ?= $(PATH_TOOL_VCC80AMD64)/lib/amd64
 PATH_TOOL_VCC80AMD64_INC ?= $(PATH_TOOL_VCC80AMD64)/include
-PATH_TOOL_VCC80AMD64_ATLMFC ?= $(PATH_TOOL_VCC80X86)/atlmfc
+PATH_TOOL_VCC80AMD64_ATLMFC ?= $(PATH_TOOL_VCC80AMD64)/atlmfc
 PATH_TOOL_VCC80AMD64_ATLMFC_INC ?= $(PATH_TOOL_VCC80AMD64_ATLMFC)/include
 PATH_TOOL_VCC80AMD64_ATLMFC_LIB ?= $(PATH_TOOL_VCC80AMD64_ATLMFC)/lib/amd64

trunk/kBuild/tools/XGCCAMD64LINUX.kmk

@@ -34 +34 @@
 else # x-compile:
  # find the latest xgcc build.
- ifdef TOOL_XGCCAMD64LINUX_PREFIX
+ ifndef TOOL_XGCCAMD64LINUX_PREFIX
   TOOL_XGCCAMD64LINUX_PREFIX := x86_64-unknown-linux-gnu-
   ifndef PATH_TOOL_XGCCAMD64LINUX
@@ -199 +199 @@
         $(QUIET)$(APPEND) -n $(out).ar-script \
                 $(foreach o,$(objs), 'ADDMOD $(o)') \
-                $(foreach o,$(othersrc)), 'ADDLIB $(o)')
+                $(foreach o,$(othersrc), 'ADDLIB $(o)')
         $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
         $(QUIET)$(APPEND) $(out).ar-script 'END'