Changeset 2143 in kBuild for trunk

Timestamp:

Dec 25, 2008 10:56:28 PM (16 years ago)

Author:

bird

Message:

footer.kmk: pick up some keywords variants of *SUFF. Fixes #50.

File:

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

trunk/kBuild/footer.kmk

@@ -1406 +1406 @@
  $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
 endif
-ifeq ($(tool_prefix),AR) ## @todo fix this mess!
-local suff := $(firstword\
+## @todo fix the fun at the last line (AR != LIB => mess).
+local suff := $(firstword \
         $($(target)_$(EXT)SUFF.$(bld_trg).$(bld_trg_arch))\
         $($(target)_$(EXT)SUFF.$(bld_trg))\
@@ -1414 +1414 @@
         $(TOOL_$(tool)_$(tool_prefix)$(EXT)SUFF.$(bld_trg))\
         $(TOOL_$(tool)_$(tool_prefix)$(EXT)SUFF)\
-        $(SUFF_LIB))
-else
-local suff := $(firstword \
-        $($(target)_$(EXT)SUFF) \
-        $($(target)_$(EXT)SUFF) \
-        $(TOOL_$(tool)_$(tool_prefix)$(EXT)SUFF) \
-        $($(EXTPRE)SUFF_$(EXT)))
-endif
+        $(if $(eq $(tool_prefix),AR),$(SUFF_LIB),$($(EXTPRE)SUFF_$(EXT))) )
 local out := $(outbase)$(suff)
 
@@ -2563 +2556 @@
  $(error kBuild internal error: PATH_$(target)=$(PATH_$(target)) expected $(patsubst %/,%,$(dir $(outbase))))
 endif
-local suff        := $(firstword \
-        $($(target)_$(EXT)SUFF) \
-        $($(target)_$(EXT)SUFF) \
-        $(TOOL_$(tool)_LD$(EXT)SUFF) \
-        $($(EXTPRE)SUFF_$(EXT)))
+local suff := $(firstword \
+        $($(target)_$(EXT)SUFF.$(bld_trg).$(bld_trg_arch))\
+        $($(target)_$(EXT)SUFF.$(bld_trg))\
+        $($(target)_$(EXT)SUFF)\
+        $(TOOL_$(tool)_LD$(EXT)SUFF.$(bld_trg).$(bld_trg_arch))\
+        $(TOOL_$(tool)_LD$(EXT)SUFF.$(bld_trg))\
+        $(TOOL_$(tool)_LD$(EXT)SUFF)\
+        $($(EXTPRE)SUFF_$(EXT)) )
 local out         := $(outbase)$(suff)
 TARGET_$(target)  := $(out)