Changeset 2434 for trunk/kBuild/footer.kmk

Timestamp:

Jan 9, 2011, 6:45:08 PM (15 years ago)

Author:

bird

Message:

kBuild: Deprecating PATH_<target> and <target>_PATH in favor of <target>_0_OUTDIR and <target>_DEFPATH.

File:

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

trunk/kBuild/footer.kmk

@@ -158 +158 @@
         $(TOOL.$(bld_trg)) \
         $(TOOL) \
+))
 else
 _TARGET_TOOL = $(strip $(firstword \
@@ -188 +189 @@
         $(TOOL.$(bld_type)) \
         $(TOOL) \
-        ))
+))
 endif
 
@@ -2218 +2219 @@
         $(SUFF_LIB))
 local out         := $(outbase)$(suff)
-local defpath     := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
+local defpath     := $($(target)_DEFPATH)
+ifeq ($(defpath),)
+ local defpath    := $($(target)_PATH)
+endif
 TARGET_$(target)  := $(out)
 $(target)_1_TARGET:= $(out)
@@ -2474 +2478 @@
 TARGET_$(target)  := $(out)
 $(target)_1_TARGET:= $(out)
-local defpath     := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
+local defpath     := $($(target)_DEFPATH)
+ifeq ($(defpath),)
+ local defpath    := $($(target)_PATH)
+endif
 # no local here - must be writable across some foreachs.
 othersrc          :=
@@ -3127 +3134 @@
 
 # Adjust the source if we got a default PATH. (This must be done this late!)
-local defpath := $(firstword $($(target)_PATH) $($(target)_DEFPATH))
+local defpath     := $($(target)_DEFPATH)
+ifeq ($(defpath),)
+ local defpath    := $($(target)_PATH)
+endif
 ifneq ($(defpath),)
  local srcsrc := $(abspathex $(srcsrc),$(defpath))