Changeset 3423 for trunk/kBuild/header.kmk

Timestamp:

Aug 21, 2020, 1:49:39 PM (5 years ago)

Author:

bird

Message:

header.kmk: Complain if legacy variables like BUILD_TYPE and BUILD_TARGET_ARCH are seen on the command line. Removed temporary KBUILD_HOST* fallback definitions.

File:

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

trunk/kBuild/header.kmk

@@ -235 +235 @@
  ifneq ($(KBUILD_TYPE),$(BUILD_TYPE))
   ifeq ($(origin KBUILD_TYPE):$(origin BUILD_TYPE),environment:command line)
+   $(warning kBuild: Please use KBUILD_TYPE instead of BUILD_TYPE on the command line!)
    KBUILD_TYPE := $(BUILD_TYPE)
   else ifneq ($(origin KBUILD_TYPE):$(origin BUILD_TYPE),command line:environment)
-   $(error kBuild: KBUILD_TYPE and BUILD_TYPE disagree.)
+   $(error kBuild: KBUILD_TYPE (command line) and BUILD_TYPE (env) disagree.)
   endif
  endif
@@ -252 +253 @@
   $(error kBuild: The KBUILD_TYPE value '$(KBUILD_TYPE)' contains spaces/tabs!)
  endif
-endif
-
-
-#
-# Host platform legacy
-# kmk deals with this, so this is only temporary until I've rebuilt everything.
-#
-ifndef KBUILD_HOST
- KBUILD_HOST := $(BUILD_PLATFORM)
-endif
-ifndef KBUILD_HOST_ARCH
- KBUILD_HOST_ARCH := $(BUILD_PLATFORM_ARCH)
-endif
-ifndef KBUILD_HOST_CPU
- KBUILD_HOST_CPU := $(BUILD_PLATFORM_CPU)
 endif
 
@@ -315 +301 @@
  ifneq ($(KBUILD_TARGET),$(BUILD_TARGET))
   ifeq ($(origin KBUILD_TARGET):$(origin BUILD_TARGET),environment:command line)
+   $(warning kBuild: Please use KBUILD_TARGET instead of BUILD_TARGET on the command line!)
    KBUILD_TARGET := $(BUILD_TARGET)
   else ifneq ($(origin KBUILD_TARGET):$(origin BUILD_TARGET),command line:environment)
@@ -330 +317 @@
  ifneq ($(KBUILD_TARGET_ARCH),$(BUILD_TARGET_ARCH))
   ifeq ($(origin KBUILD_TARGET_ARCH):$(origin BUILD_TARGET_ARCH),environment:command line)
+   $(warning kBuild: Please use KBUILD_TARGET_ARCH instead of BUILD_TARGET_ARCH on the command line!)
    KBUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH)
   else ifneq ($(origin KBUILD_TARGET_ARCH):$(origin BUILD_TARGET_ARCH),command line:environment)
@@ -345 +333 @@
  ifneq ($(KBUILD_TARGET_CPU),$(BUILD_TARGET_CPU))
   ifeq ($(origin KBUILD_TARGET_CPU):$(origin BUILD_TARGET_CPU),environment:command line)
+   $(warning kBuild: Please use KBUILD_TARGET_CPU instead of BUILD_TARGET_CPU on the command line!)
    KBUILD_TARGET_CPU := $(BUILD_TARGET_CPU)
   else ifneq ($(origin KBUILD_TARGET_CPU):$(origin BUILD_TARGET_CPU),command line:environment)