Changeset 2512 in kBuild

Timestamp:

Jul 25, 2011 11:26:45 AM (14 years ago)

Author:

bird

Message:

header.kmk: Require kmk version 0.1.999 or later.

File:

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

trunk/kBuild/header.kmk

@@ -71 +71 @@
  endif
 else
- if $(KBUILD_VERSION_PATCH) < 5
-  $(warning kBuild: kmk version mismatch! Expected 0.1.5 or later. Actual version is $(KBUILD_VERSION).)
+ if $(KBUILD_VERSION_PATCH) < 999
+  $(error kBuild: kmk version mismatch! Expected 0.1.999 or later. Actual version is $(KBUILD_VERSION).)
  endif
 endif
@@ -698 +698 @@
 
 # When copying to the staging area, use hard links to save time and space.
-INSTALL_STAGING := $(INSTALL)
 ifndef KBUILD_NO_HARD_LINKING
- if1of ($(KMK_FEATURES), install-hard-linking)
-  INSTALL_STAGING := $(INSTALL) --hard-link-files-when-possible
- endif
+ INSTALL_STAGING := $(INSTALL) --hard-link-files-when-possible
+else
+ INSTALL_STAGING := $(INSTALL)
 endif
 
@@ -746 +745 @@
 # Similar to firstword, except it returns the value of first defined variable.
 # @param        $1              list of variables to probe.
-if1of ($(KMK_FEATURES), firstdefined)
- define FIRST-DEFINED-VAR
-  local .RETURN := $(strip $(firstdefined $1, value))
- endef
-else
- define FIRST-DEFINED-VAR
-  if "$1" != ""
-   local var := $(word 1,$1)
-   ifdef $(var)
-    local .RETURN := $(strip $($(var)))
-   else
-    local .RETURN := $(evalcall FIRST-DEFINED-VAR, $(wordlist 2,32,$1))
-   endif
-  else
-   local .RETURN :=
-  endif
- endef
-endif
+define FIRST-DEFINED-VAR
+local .RETURN := $(strip $(firstdefined $1, value))
+endef
 
 ## Figure out where to put object files.