Changeset 994 for trunk/kBuild/header.kmk

Timestamp:

May 29, 2007, 10:00:08 PM (18 years ago)

Author:

bird

Message:

logical order. use test. Made the CPU defaults consistent.

File:

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

trunk/kBuild/header.kmk

@@ -177 +177 @@
 
 ifeq ($(strip $(BUILD_PLATFORM_CPU)),)
- $(error kBuild: The BUILD_PLATFORM_CPU value is missing (should be set by kmk)!)
-endif
-ifneq (.$(words $(BUILD_PLATFORM_CPU)).$(BUILD_PLATFORM_CPU).,.1.$(strip $(BUILD_PLATFORM_CPU)).)
- $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' contains spaces/tabs!)
-endif
-ifneq ($(filter $(BUILD_PLATFORM_CPU), $(KBUILD_OSES) $(BUILD_ARCHES)),)
- $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' was found in the OS or architecture keywords!)
-endif
-ifeq ($(BUILD_PLATFORM_CPU),$(BUILD_TYPE))
- $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' is the same as the BUILD_TYPE!)
+ BUILD_PLATFORM_CPU := blend
+else
+ ifneq (.$(words $(BUILD_PLATFORM_CPU)).$(BUILD_PLATFORM_CPU).,.1.$(strip $(BUILD_PLATFORM_CPU)).)
+  $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' contains spaces/tabs!)
+ endif
+ ifneq ($(filter $(BUILD_PLATFORM_CPU), $(KBUILD_OSES) $(BUILD_ARCHES)),)
+  $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' was found in the OS or architecture keywords!)
+ endif
+ ifeq ($(BUILD_PLATFORM_CPU),$(BUILD_TYPE))
+  $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' is the same as the BUILD_TYPE!)
+ endif
 endif
 
@@ -218 +219 @@
 ifndef BUILD_TARGET_CPU
  BUILD_TARGET_CPU := $(BUILD_PLATFORM_CPU)
-else
- ifeq ($(strip $(BUILD_TARGET_CPU)),)
-  $(error kBuild: The BUILD_TARGET_CPU value is missing (should be set by kmk)!)
- endif
+else ifeq ($(strip $(BUILD_TARGET_CPU)),)
+ ifeq ($(BUILD_TARGET_ARCH),$(BUILD_PLATFORM_ARCH))
+  BUILD_TARGET_CPU := $(BUILD_PLATFORM_CPU)
+ else
+  BUILD_TARGET_CPU := blend
+ endif
+else
  ifneq (.$(words $(BUILD_TARGET_CPU)).$(BUILD_TARGET_CPU).,.1.$(strip $(BUILD_TARGET_CPU)).)
   $(error kBuild: The BUILD_TARGET_CPU value '$(BUILD_TARGET_CPU)' contains spaces/tabs!)