Changeset 148 in kBuild

Timestamp:

Sep 7, 2004 8:16:14 PM (21 years ago)

Author:

bird

Message:

Fixed the problem which lead to the PATH2 hack. PATH2 is gone.

File:

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

trunk/kBuild/footer.kmk

@@ -112 +112 @@
         $(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))
 
 ## Figure out where to put object files.
 # @param    $1      source file
 # @param    $2      normalized main target
-_OBJECT_BASE = $(PATH_TARGET)/$(2)/$(basename $(1))
+_OBJECT_BASE = $(PATH_TARGET)/$(2)/$(call no-root-slash,$(call no-drive,$(basename $(patsubst $(PATH_TARGET)/$(2)/%,gen/%,$(1)))))
 
 ## Figure out where to put object files.
 # @param    $1      real target name.
 # @param    $2      normalized main target
-_TARGET_BASE = $(PATH_TARGET)/$(2)/$(basename $(1))
+_TARGET_BASE = $(PATH_TARGET)/$(2)/$(call no-root-slash,$(call no-drive,$(basename $(1))))
 
 
@@ -631 +639 @@
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
-$(eval PATH2_$(target) := $(subst :, ,$(PATH_$(target))))
-$(eval PATH2_$(target) := $(word $(words $(PATH2_$(target))),$(PATH2_$(target))))
 $(eval libsuff     := $(firstword\
         $($(target)_LIBSUFF.$(BUILD_TARGET))\
@@ -695 +701 @@
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
-$(eval PATH2_$(target) := $(subst :, ,$(PATH_$(target))))
-$(eval PATH2_$(target) := $(word $(words $(PATH2_$(target))),$(PATH2_$(target))))
 $(eval exesuff     := $(firstword $($(target)_EXESUFF) $($(target)_EXESUFF) $(TOOL_$(tool)_LDEXESUFF) $(SUFF_EXE)))
 $(eval exe         := $(outbase)$(exesuff))
@@ -848 +852 @@
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
-$(eval PATH2_$(target) := $(subst :, ,$(PATH_$(target))))
-$(eval PATH2_$(target) := $(word $(words $(PATH2_$(target))),$(PATH2_$(target))))
 $(eval dllsuff     := $(firstword $($(target)_DLLSUFF) $($(target)_DLLSUFF) $(TOOL_$(tool)_LDDLLSUFF) $(SUFF_DLL)))
 $(eval dll         := $(outbase)$(dllsuff))
@@ -1015 +1017 @@
 $(eval outbase     := $(call _TARGET_BASE,$(target),$(target)))
 $(eval PATH_$(target) := $(patsubst %/,%,$(dir $(outbase))))
-$(eval PATH2_$(target) := $(subst :, ,$(PATH_$(target))))
-$(eval PATH2_$(target) := $(word $(words $(PATH2_$(target))),$(PATH2_$(target))))
 $(eval syssuff     := $(firstword $($(target)_SYSSUFF) $($(target)_SYSSUFF) $(TOOL_$(tool)_LDSYSSUFF) $(SUFF_SYS)))
 $(eval sys         := $(outbase)$(syssuff))