Changeset 850 in kBuild for trunk

Timestamp:

Feb 8, 2007 10:43:31 PM (18 years ago)

Author:

bird

Message:

Moved the gnumake-header.kmk inclusion a bit down so the 'override' on the APPEND* definitions can be removed.

Location:

trunk/kBuild

Files:

• gnumake-header.kmk (modified) (1 diff)
• header.kmk (modified) (2 diffs)

trunk/kBuild/gnumake-header.kmk

@@ -67 +67 @@
 ##
 # Use the APPEND shell script in case we're boot strapping.
-override APPEND_EXT := $(PATH_KBUILD)/gnumake-append.sh
-override APPEND = $(APPEND_EXT)
+APPEND_EXT := $(PATH_KBUILD)/gnumake-append.sh
+APPEND = $(APPEND_EXT)
 
 #

trunk/kBuild/header.kmk

@@ -227 +227 @@
   endif
  endif
-else
- include $(PATH_KBUILD)/gnumake-header.kmk
 endif
 
@@ -705 +703 @@
 # all passes mentioned by DEFAULT_PASSES.
 PASSES := FETCHES PATCHES $(DEFAULT_PASSES) NOTHING CLEAN
+
+
+#
+# Include the gnumake header hacks if we're not using kmk.
+#
+ifndef KMK_VERSION
+ include $(PATH_KBUILD)/gnumake-header.kmk
+endif