Changeset 329 in kBuild for trunk

Timestamp:

Oct 28, 2005 11:36:23 PM (19 years ago)

Author:

bird

Message:

Fixed a couple of defaults so it all works right on amd64.

File:

• trunk/kBuild/header.kmk (modified) (9 diffs)

trunk/kBuild/header.kmk

@@ -117 +117 @@
 $(error kBuild: BUILD_PLATFORM value '$(BUILD_PLATFORM)' was not recongized!)
 endif
+
+# Fill in defaults if needed.
+ifndef BUILD_PLATFORM_ARCH 
 BUILD_PLATFORM_ARCH   := x86
+endif
+ifndef BUILD_PLATFORM_CPU
 BUILD_PLATFORM_CPU    := i586
+endif
 
 
@@ -173 +179 @@
 endif
 endif
+
+# Fill in defaults if needed.
+ifndef BUILD_TARGET_ARCH
 BUILD_TARGET_ARCH   := x86
+endif
+ifndef BUILD_TARGET_CPU
 BUILD_TARGET_CPU    := i586
+endif
 
 # Adjust the DEPTH definition first
@@ -210 +222 @@
 endif
 ifndef PATH_OUT
+ifeq ($(BUILD_PLATFORM_ARCH),x86)
 ifdef BUILD_TARGET_SUB # (BUILD_TARGET_SUB is not currently recognized by kBuild in any other places.)
 PATH_OUT            := $(PATH_OUT_BASE)/$(BUILD_TARGET)/$(BUILD_TARGET_SUB)/$(BUILD_TYPE)
@@ -215 +228 @@
 PATH_OUT            := $(PATH_OUT_BASE)/$(BUILD_TARGET)/$(BUILD_TYPE)
 endif
-endif
+else  # !x86
+ifdef BUILD_TARGET_SUB # (BUILD_TARGET_SUB is not currently recognized by kBuild in any other places.)
+PATH_OUT            := $(PATH_OUT_BASE)/$(BUILD_TARGET)/$(BUILD_TARGET_ARCH)/$(BUILD_TARGET_SUB)/$(BUILD_TYPE)
+else
+PATH_OUT            := $(PATH_OUT_BASE)/$(BUILD_TARGET)/$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)
+endif
+endif # !x86 
+endif # !define PATH_OUT
 PATH_OBJ            := $(PATH_OUT)/obj
 PATH_TARGET         := $(PATH_OBJ)/$(CURSUBDIR)
@@ -237 +257 @@
 PATH_KBUILD         := $(abspath $(PATH_KBUILD))
 endif
-# kBuild tools
-PATH_TOOLS_W32      := $(PATH_KBUILD)/bin/x86.win32
-PATH_TOOLS_LNX      := $(PATH_KBUILD)/bin/x86.linux
-PATH_TOOLS_OS2      := $(PATH_KBUILD)/bin/x86.os2
-PATH_TOOLS_FREEBSD  := $(PATH_KBUILD)/bin/amd64.freebsd
 # kBuild files which might be of interest.
 FILE_KBUILD_HEADER  := $(PATH_KBUILD)/header.kmk
@@ -261 +276 @@
 # Build platform setup.
 #
+PATH_TOOLS          := $(PATH_KBUILD)/bin/$(BUILD_PLATFORM_ARCH).$(BUILD_PLATFORM)
+
 # OS/2
 ifeq ($(BUILD_PLATFORM),os2)
-PATH_TOOLS          := $(PATH_TOOLS_OS2)
 EXEC_X86_WIN32      := innopec.exe
 HOSTSUFF_EXE        := .exe
@@ -270 +286 @@
 # Linux
 ifeq ($(BUILD_PLATFORM),linux)
-PATH_TOOLS          := $(PATH_TOOLS_LNX)
 EXEC_X86_WIN32      := wine
 HOSTSUFF_EXE        :=
@@ -277 +292 @@
 # Win32
 ifeq ($(BUILD_PLATFORM),win32)
-PATH_TOOLS          := $(PATH_TOOLS_W32)
 EXEC_X86_WIN32      :=
 HOSTSUFF_EXE        := .exe
@@ -284 +298 @@
 # FreeBSD
 ifeq ($(BUILD_PLATFORM),freebsd)
-PATH_TOOLS          := $(PATH_TOOLS_FREEBSD)
 EXEC_X86_WIN32      := wine
 HOSTSUFF_EXE        :=