Changeset 1506 for trunk/bootstrap.gmk

Timestamp:

Apr 9, 2008, 2:22:07 AM (17 years ago)

Author:

bird

Message:

Environment / global variable renaming.

File:

• trunk/bootstrap.gmk (modified) (7 diffs)

trunk/bootstrap.gmk

@@ -28 +28 @@
 #
 # ASSUMES:
-#   - BUILD_TARGET, BUILD_PLATFORM_ARCH, BUILD_PLATFORM_CPU and BUILD_TYPE in the env.
+#   - KBUILD_TARGET, KBUILD_HOST, KBUILD_HOST_ARCH, and KBUILD_TYPE in the env.
 #   - PATH_KBUILD points to ./kBuild with an absolute path.
 #   - PATH_KBUILD_BIN must *NOT* be defined anywhere.
@@ -36 +36 @@
 #   - cp -f works
 #   - cd somedir && command works.
-#   - echo done > file works.
+#   - echo done > some-file works.
 #   - GNU make implements CURDIR, if not please define SRCDIR.
 #
@@ -49 +49 @@
 #
 
+#
+# Deal with legacy env.vars. - no niceties here.
+#
+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
+
+ifndef KBUILD_TARGET
+ KBUILD_TARGET := $(BUILD_TARGET)
+endif
+ifndef KBUILD_TARGET_ARCH
+ KBUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH)
+endif
+ifndef KBUILD_TARGET_CPU
+ KBUILD_TARGET_CPU := $(BUILD_TARGET_CPU)
+endif
+
+ifndef KBUILD_TYPE
+ KBUILD_TYPE := $(BUILD_TYPE)
+endif
+
+ifndef KBUILD_PATH
+ KBUILD_PATH := $(PATH_KBUILD)
+endif
+
+
+#
+# Globals
+#
 SRCDIR = $(CURDIR)
-OUTDIR = $(SRCDIR)/out/$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)/$(BUILD_TYPE)/bootstrap
+OUTDIR = $(SRCDIR)/out/$(KBUILD_HOST).$(KBUILD_HOST_ARCH)/$(KBUILD_TYPE)/bootstrap
 
 # Override this on the make commandline if you need to (FreeBSD).
@@ -66 +101 @@
     $(OUTDIR)/kmk/kmk_ash \
     $(OUTDIR)/kmk/kmk_sed \
-    $(SRCDIR)/src/kmk/config.h.$(BUILD_TARGET) \
-    $(SRCDIR)/src/sed/config.h.$(BUILD_TARGET)
+    $(SRCDIR)/src/kmk/config.h.$(KBUILD_TARGET) \
+    $(SRCDIR)/src/sed/config.h.$(KBUILD_TARGET)
 
 # kmk
@@ -81 +116 @@
 $(OUTDIR)/kmk/config.h: $(OUTDIR)/kmk/ts-configured
 
-$(SRCDIR)/src/kmk/config.h.$(BUILD_TARGET): $(OUTDIR)/kmk/config.h
-        cp -f $(OUTDIR)/kmk/config.h $(SRCDIR)/src/kmk/config.h.$(BUILD_TARGET)
+$(SRCDIR)/src/kmk/config.h.$(KBUILD_TARGET): $(OUTDIR)/kmk/config.h
+        cp -f $(OUTDIR)/kmk/config.h $(SRCDIR)/src/kmk/config.h.$(KBUILD_TARGET)
 
 $(OUTDIR)/kmk/kmk: $(OUTDIR)/kmk/ts-configured
@@ -99 +134 @@
 $(OUTDIR)/sed/config.h: $(OUTDIR)/sed/ts-configured
 
-$(SRCDIR)/src/sed/config.h.$(BUILD_TARGET): $(OUTDIR)/sed/config.h
+$(SRCDIR)/src/sed/config.h.$(KBUILD_TARGET): $(OUTDIR)/sed/config.h
         cp -f $< $@
 
@@ -120 +155 @@
 
 $(OUTDIR)/ts-stage2-build: \
-                $(SRCDIR)/src/kmk/config.h.$(BUILD_TARGET) \
-                $(SRCDIR)/src/sed/config.h.$(BUILD_TARGET) \
+                $(SRCDIR)/src/kmk/config.h.$(KBUILD_TARGET) \
+                $(SRCDIR)/src/sed/config.h.$(KBUILD_TARGET) \
                 $(OUTDIR)/kmk/kmk
         $(OUTDIR)/kmk/kmk -C $(SRCDIR)