Changeset 380 for trunk/kBuild/tools/GCC.kmk

Timestamp:

Dec 18, 2005, 2:52:47 PM (20 years ago)

Author:

bird

Message:

Big command dependency job. More installation stuff.

File:

• trunk/kBuild/tools/GCC.kmk (modified) (6 diffs)

trunk/kBuild/tools/GCC.kmk

@@ -76 +76 @@
 # @param    $(dirdep)   Directory creation dependency.
 # @param    $(deps)             Other dependencies.
-#
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-define TOOL_GCC_COMPILE_C
-#$ (warning dbg: TOOL_GCC_COMPILE_C: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
-$(obj): $(deps) $(source) | $(dirdep)
-        $(call MSG_L2,Compiling $$@ using GCC)
+#
+TOOL_GCC_COMPILE_C_OUTPUT =
+TOOL_GCC_COMPILE_C_DEPEND =
+TOOL_GCC_COMPILE_C_DEPORD =
+define TOOL_GCC_COMPILE_C_CMDS
         $(TOOL_GCC_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$$@ \
-                -o $$@\
+                -Wp,-MD,$(dep) -Wp,-MT,$(out) \
+                -o $(out)\
                 $(call ABSPATH,$(source))
-
 endef
 
@@ -105 +104 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-define TOOL_GCC_COMPILE_CXX
-#$ (warning dbg: TOOL_GCC_COMPILE_CXX: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff) deps=$(deps))
-$(obj): $(deps) $(source) | $(dirdep)
-        $(call MSG_L2,Compiling $$@ using GCC)
+TOOL_GCC_COMPILE_CXX_OUTPUT =
+TOOL_GCC_COMPILE_CXX_DEPEND =
+TOOL_GCC_COMPILE_CXX_DEPORD =
+define TOOL_GCC_COMPILE_CXX_CMDS
         $(TOOL_GCC_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$$@ \
-                -o $$@\
+                -Wp,-MD,$(dep) -Wp,-MT,$(out) \
+                -o $(out)\
                 $(call ABSPATH,$(source))
-
 endef
 
@@ -120 +118 @@
 ## Link library
 # @param    $(target)   Normalized main target name.
-# @param    $(lib)              Library name.
+# @param    $(out)      Library name.
 # @param    $(objs)     Object files to put in the library.
 # @param    $(flags)    Flags.
@@ -127 +125 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-define TOOL_GCC_LINK_LIBRARY
-#$ (warning dbg: TOOL_GCC_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
-$(lib): $(deps) $(objs) | $(dirdep)
-        $(call MSG_L1,Creating Library $$@)
-        $(RM) -f $$@
-        $(TOOL_GCC_AR) $(flags) $$@ $(objs)
-
+TOOL_GCC_LINK_LIBRARY_OUTPUT =
+TOOL_GCC_LINK_LIBRARY_DEPEND =
+TOOL_GCC_LINK_LIBRARY_DEPORD = 
+define TOOL_GCC_LINK_LIBRARY_CMDS
+        $(TOOL_GCC_AR) $(flags) $(out) $(objs)
 endef
 
@@ -151 +147 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-define TOOL_GCC_LINK_PROGRAM
-#$ (warning dbg: TOOL_GCC_LINK_PROGRAM: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
-$(out): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
-        $(call MSG_L1,Creating Program $$@)
-ifneq ($(custom_pre),)
-        $(eval $(custom_pre))
-endif
-        $(TOOL_GCC_LD) $(flags) -o $$@ $(objs) \
-        $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
-ifneq ($(custom_post),)
-        $(eval $(custom_post))
-endif
-
+TOOL_GCC_LINK_PROGRAM_OUTPUT =
+TOOL_GCC_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GCC_LINK_PROGRAM_DEPORD = 
+define TOOL_GCC_LINK_PROGRAM_CMDS
+        $(TOOL_GCC_LD) $(flags) -o $(out) $(objs) \
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
 endef
 
@@ -179 +168 @@
 # @param    $(custom_pre)   Custom step invoked before linking.
 # @param    $(custom_post)  Custom step invoked after linking.
-#
-# @param    $(outbase)  Output basename (full). Use this for list files and such.
-define TOOL_GCC_LINK_DLL
-#$ (warning dbg: TOOL_GCC_LINK_DLL: target=$(target) out=$(out) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
-$(out): $(deps) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) | $(dirdep)
-        $(call MSG_L1,Creating Program $$@)
-ifneq ($(custom_pre),)
-        $(eval $(custom_pre))
-endif
-        $(TOOL_GCC_LD) $(TOOL_GCC_LDFLAGS.dll) $(flags) -o $$@ $(objs) \
+# @param    $(outbase)      Output basename (full). Use this for list files and such.
+TOOL_GCC_LINK_DLL_OUTPUT =
+TOOL_GCC_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GCC_LINK_DLL_DEPORD = 
+define TOOL_GCC_LINK_DLL_CMDS
+        $(TOOL_GCC_LD) $(TOOL_GCC_LDFLAGS.dll) $(flags) -o $(out) $(objs) \
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
-ifneq ($(custom_post),)
-        $(eval $(custom_post))
-endif
-
 endef