Changeset 743 for trunk/kBuild/footer.kmk

Timestamp:

Dec 17, 2006, 9:12:30 AM (19 years ago)

Author:

bird

Message:

set PATH_target early (i.e. in subheader/subfooter).

File:

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

trunk/kBuild/footer.kmk

@@ -143 +143 @@
         $(TOOL) \
         ))
-
-## Removes the drive letter from a path (if it has one)
-# @param        $1              the path
-no-drive=$(word $(words $(subst :, ,$(1))),$(subst :, ,$(1)))
-
-## Removes the root slash from a path (if it has one)
-# @param        $1              the path
-no-root-slash=$(patsubst /%,%,$(1))
-
-ifneq ($(filter abspathex,$(KMK_FEATURES)),abspathex) ## @todo Retire this to gnumake-header.kmk when it has been implemented.
-## Converts an relative path to an absolute path using the given CWD.
-# @returns absolute path.
-# @param    $1      The path to fixup.
-# @param    $2      The CWD to use.
-abspathex = $(foreach _fix_path,$1\
-,$(if $(subst :$(call no-root-slash,$(call no-drive,$(_fix_path))):,,:$(_fix_path):),$(_fix_path),$(abspath $2/$(_fix_path))))
-endif
-
-## Figure out where to put object files.
-# @param    $1      real target name.
-# @param    $2      normalized main target
-_TARGET_BASE = $(PATH_TARGET)/$(2)/$(call no-root-slash,$(call no-drive,$(basename $(1))))
-
 
 ## Figure out the actual name of an installed file.
@@ -887 +864 @@
 $(out): $(comp-vars _TARGET_$(target)_DIGEST_PREV,_TARGET_$(target)_DIGEST,FORCE) | $(call DIRDEP,$(inst))
         $$(QUIET)$$(RM) -f $$@
-        $$(call MSG_L1,$$(if $$(wildcard $(out).lst),$$(if $$(_TARGET_$(target)_DIGEST),Re-fetching,Removing),Fetching) $(target)...)
+        $$(call MSG_L1,$$(if $$(_TARGET_$(target)_DIGEST),$$(if $$(wildcard $(out).lst),Re-fetching,Fetching),Removing) $(target)...)
         $$(QUIET)$$(if $$(wildcard $(out).lst      ),$$(MAKE) -f $(MAKEFILE) --no-print-directory $(out)_unfetched)
         $$(QUIET)$$(if  $$(_TARGET_$(target)_DIGEST),$$(MAKE) -f $(MAKEFILE) --no-print-directory $(out).lst,$$(RMDIR) -p --ignore-fail-on-non-empty --ignore-fail-on-not-exist $$(dir $$@))
@@ -1172 +1149 @@
 $(error kBuild: Library target $(target) does not have a tool defined!)
 endif
-outbase     := $(call _TARGET_BASE,$(target),$(target))
-PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
+outbase     := $(call TARGET_BASE,$(target),$(target))
+ifndef PATH_$(target)
+ PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
+else
+ ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase))))
+  $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
+ endif
+endif
 suff        := $(firstword\
         $($(target)_LIBSUFF.$(bld_trg).$(bld_trg_arch))\
@@ -1192 +1175 @@
 # library linking
 tool        := $(call _TARGET_TOOL,$(target),AR)
-outbase     := $(call _TARGET_BASE,$(target),$(target))
+outbase     := $(call TARGET_BASE,$(target),$(target))
 flags       :=\
         $(TOOL_$(tool)_ARFLAGS)\
@@ -1294 +1277 @@
 
 tool        := $(call _TARGET_TOOL,$(target),LD)
-outbase     := $(call _TARGET_BASE,$(target),$(target))
+outbase     := $(call TARGET_BASE,$(target),$(target))
+ifndef PATH_$(target)
+ PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
+else
+ ifneq ($(PATH_$(target)),$(patsubst %/,%,$(dir $(outbase))))
+  $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
+ endif
+endif
 suff        := $(firstword \
         $($(target)_$(EXT)SUFF) \
@@ -1301 +1291 @@
         $($(EXTPRE)SUFF_$(EXT)))
 out         := $(outbase)$(suff)
-PATH_$(target)   := $(patsubst %/,%,$(dir $(outbase)))
 TARGET_$(target) := $(out)
 $(target)_OBJS_  :=
@@ -1311 +1300 @@
 # more library stuff.
 tool        := $(call _TARGET_TOOL,$(target),LD)
-outbase     := $(call _TARGET_BASE,$(target),$(target))
+outbase     := $(call TARGET_BASE,$(target),$(target))
 flags       :=\
         $(TOOL_$(tool)_LDFLAGS)\