Changeset 2491 in kBuild

Timestamp:

Jul 22, 2011 11:17:10 AM (14 years ago)

Author:

bird

Message:

header.kmk: Use firstdefined if present.

File:

• trunk/kBuild/header.kmk (modified) (1 diff)

trunk/kBuild/header.kmk

@@ -746 +746 @@
 # Similar to firstword, except it returns the value of first defined variable.
 # @param        $1              list of variables to probe.
-define FIRST-DEFINED-VAR
- if "$1" != ""
-  local var := $(word 1,$1)
-  ifdef $(var)
-   local .RETURN := $(strip $($(var)))
+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 := $(evalcall FIRST-DEFINED-VAR, $(wordlist 2,32,$1))
+   local .RETURN :=
   endif
- else
-  local .RETURN :=
- endif
-endef
+ endef
+endif
 
 ## Figure out where to put object files.