Changeset 353 for trunk/kBuild/tools/GCC3.kmk

Timestamp:

Dec 12, 2005, 4:36:07 AM (20 years ago)

Author:

bird

Message:

Use fixed lot's of those $$$$(PATH_<target>) thingies. Better target install, install pass and install target type. Generic passes. And more.

File:

• trunk/kBuild/tools/GCC3.kmk (modified) (11 diffs)

trunk/kBuild/tools/GCC3.kmk

@@ -4 +4 @@
 # kBuild Tool Config - Generic GCC.
 #
-# Copyright (c) 2004 knut st. osmundsen <bird-srcspam@anduin.net>
+# Copyright (c) 2004-2005 knut st. osmundsen <bird-srcspam@anduin.net>
 #
 #
@@ -146 +146 @@
 define TOOL_GCC3_LINK_LIBRARY_ADDMOD
 
-        echo "ADDMOD $(o)" >> $$@.ar-script
+        echo "ADDMOD $(o)" >> $(lib).ar-script
 endef
 
@@ -153 +153 @@
         $(MKDIR) -p $(dir $(outbase))ar.extract/$(notdir $(srclib))
         cd $(dir $(outbase))ar.extract/$(notdir $(srclib)) && $(TOOL_GCC3_AR) x $(srclib)
-        for o in `$(TOOL_GCC3_AR) t $(srclib)`; do echo "ADDMOD $(dir $(outbase))ar.extract/$(notdir $(srclib))/$$$${o}" >> $$@.ar-script; done
+        for o in `$(TOOL_GCC3_AR) t $(srclib)`; do echo "ADDMOD $(dir $(outbase))ar.extract/$(notdir $(srclib))/$$$${o}" >> $(lib).ar-script; done
 endef
 
@@ -162 +162 @@
         $(RM) -f $$@
 ifneq ($(strip $(filter %.a %.lib,$(othersrc))),)
-        echo "CREATE $$@" > $$@.ar-script
+        echo "CREATE $$@" > $(lib).ar-script
         $(foreach o, $(objs),$(TOOL_GCC3_LINK_LIBRARY_ADDMOD))
         $(foreach srclib, $(filter %.a %.lib,$(othersrc)),$(TOOL_GCC3_LINK_LIBRARY_EXPAND_LIB))
-        echo "SAVE" >> $$@.ar-script
-        echo "END" >> $$@.ar-script
-        $(TOOL_GCC3_AR) -M < $$@.ar-script
+        echo "SAVE" >> $(lib).ar-script
+        echo "END" >> $(lib).ar-script
+        $(TOOL_GCC3_AR) -M < $(lib).ar-script
         $(RM) -Rf "$(dir $(outbase))ar.extract/"
+
+_OUT_FILES += $(lib).ar-script
 else
         $(TOOL_GCC3_AR) $(flags) $$@ $(objs)
@@ -178 +180 @@
 ## Link program
 # @param    $(target)   Normalized main target name.
-# @param    $(exe)              Program name.
+# @param    $(out)              Program name.
 # @param    $(objs)     Object files to link together.
 # @param    $(libs)     Libraries to search.
@@ -191 +193 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_GCC3_LINK_PROGRAM
-#$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
-$(exe): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
+#$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
+$(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -212 +214 @@
 ## Link DLL
 # @param    $(target)   Normalized main target name.
-# @param    $(dll)              Program name.
+# @param    $(out)              Program name.
 # @param    $(objs)     Object files to link together.
 # @param    $(libs)     Libraries to search.
@@ -225 +227 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_GCC3_LINK_DLL
-#$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) dll=$(dll) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
-$(dll): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
+#$ (warning dbg: TOOL_GCC3_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
+$(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)
@@ -233 +235 @@
         $(RM) -f $$@
         $(TOOL_GCC3_LD) $(TOOL_GCC3_LDFLAGS.dll) $(flags) -o $$@ \
-                $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(dll))) \
+                $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(out))) \
                 $(objs) \
                 $(foreach p,$(libpath), -L$(p)) \
@@ -247 +249 @@
 ## Link system module (windows aka driver, linux aka kernel module)
 # @param    $(target)   Normalized main target name.
-# @param    $(sys)              System module name.
+# @param    $(out)              System module name.
 # @param    $(objs)     Object files to link together.
 # @param    $(libs)     Libraries to search.
@@ -260 +262 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 define TOOL_GCC3_LINK_SYSMOD
-#$ (warning dbg: TOOL_GCC3_LINK_SYSMOD: target=$(target) sys=$(sys) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
-$(sys): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
+#$ (warning dbg: TOOL_GCC3_LINK_SYSMOD: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
+$(out) $(outbase).map: $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
         $(call MSG_L1,Creating Program $$@)
 ifneq ($(custom_pre),)