Changeset 380 for trunk/kBuild/tools/GCC3OMF.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/GCC3OMF.kmk (modified) (7 diffs)

trunk/kBuild/tools/GCC3OMF.kmk

@@ -87 +87 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-define TOOL_GCC3OMF_COMPILE_C
-#$ (warning dbg: TOOL_GCC3OMF_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 GCC3)
+TOOL_GCC3OMF_COMPILE_C_OUTPUT =
+TOOL_GCC3OMF_COMPILE_C_DEPEND =
+TOOL_GCC3OMF_COMPILE_C_DEPORD =
+define TOOL_GCC3OMF_COMPILE_C_CMDS
         $(TOOL_GCC3OMF_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$$@ -Wp,-MP \
-                -o $$@\
+                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
+                -o $(obj)\
                 $(call ABSPATH,$(source))
-
 endef
 
@@ -113 +112 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-define TOOL_GCC3OMF_COMPILE_CXX
-#$ (warning dbg: TOOL_GCC3OMF_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 GCC3)
+TOOL_GCC3OMF_COMPILE_CXX_OUTPUT =
+TOOL_GCC3OMF_COMPILE_CXX_DEPEND =
+TOOL_GCC3OMF_COMPILE_CXX_DEPORD =
+define TOOL_GCC3OMF_COMPILE_CXX_CMDS
         $(TOOL_GCC3OMF_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
-                -Wp,-MD,$(dep) -Wp,-MT,$$@ -Wp,-MP \
-                -o $$@\
+                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
+                -o $(obj)\
                 $(call ABSPATH,$(source))
-
 endef
 
@@ -128 +126 @@
 ## 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.
@@ -136 +134 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-define TOOL_GCC3OMF_LINK_LIBRARY
-#$ (warning dbg: TOOL_GCC3OMF_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) othersrc=$(othersrc) outbase=$(outbase))
-$(lib): $(deps) $(objs) $(filter %.a %.lib %.def %.imp,$(othersrc)) | $(dirdep)
-        $(call MSG_L1,Creating Library $$@)
-        $(RM) -f $$@
-        $(if $(filter %.def %.imp,$(othersrc)),$(TOOL_GCC3OMF_AR_IMP) -o $$@ $(filter %.def %.imp,$(othersrc)),)
-        $(TOOL_GCC3OMF_AR) $(flags) $$@ $(objs) $(filter %.a %.lib,$(othersrc))
-
+TOOL_GCC3OMF_LINK_LIBRARY_OUTPUT =
+TOOL_GCC3OMF_LINK_LIBRARY_DEPEND = $(filter %.a %.lib %.def %.imp,$(othersrc))
+TOOL_GCC3OMF_LINK_LIBRARY_DEPORD =
+define TOOL_GCC3OMF_LINK_LIBRARY_CMDS
+        $(if $(filter %.def %.imp,$(othersrc)),$(TOOL_GCC3OMF_AR_IMP) -o $(out) $(filter %.def %.imp,$(othersrc)),)
+        $(TOOL_GCC3OMF_AR) $(flags) $(out) $(objs) $(filter %.a %.lib,$(othersrc))
 endef
 
@@ -161 +157 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-define TOOL_GCC3OMF_LINK_PROGRAM
-#$ (warning dbg: TOOL_GCC3OMF_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))) $(filter %.def, $(othersrc)) | $(dirdep)
-        $(call MSG_L1,Creating Program $$@)
-ifneq ($(custom_pre),)
-        $(eval $(custom_pre))
-endif
-        $(TOOL_GCC3OMF_LD) $(flags) -o $$@ $(objs) \
-                $(filter %.def, $(othersrc)) \
-                $(foreach p,$(libpath), -L$(p)) \
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
+TOOL_GCC3OMF_LINK_PROGRAM_OUTPUT = $(outbase).map
+TOOL_GCC3OMF_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+        $(filter %.def, $(othersrc))
+TOOL_GCC3OMF_LINK_PROGRAM_DEPORD =
+define TOOL_GCC3OMF_LINK_PROGRAM_CMDS
+        $(TOOL_GCC3OMF_LD) $(flags) -o $(out) $(objs)\
+                $(filter %.def, $(othersrc))\
+                $(foreach p,$(libpath), -L$(p))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
                 $(call TOOL_GCC3_LD_MAP,$(outbase).map)
-ifneq ($(custom_post),)
-        $(eval $(custom_post))
-endif
-_OUT_FILES += $(outbase).map
-
 endef
 
@@ -195 +184 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-define TOOL_GCC3OMF_LINK_DLL
-#$ (warning dbg: TOOL_GCC3OMF_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))) $(filter %.def, $(othersrc)) | $(dirdep)
-        $(call MSG_L1,Creating Program $$@)
-ifneq ($(custom_pre),)
-        $(eval $(custom_pre))
-endif
-        $(TOOL_GCC3OMF_LD) $(TOOL_GCC3OMF_LDFLAGS.dll) $(flags) -o $$@ $(objs) \
-        $(filter %.def, $(othersrc)) \
-        $(foreach p,$(libpath), -L$(p)) \
-        $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
-        $(call TOOL_GCC3_LD_MAP,$(outbase).map)
-ifneq ($(custom_post),)
-        $(eval $(custom_post))
-endif
-_OUT_FILES += $(outbase).map
-
+TOOL_GCC3OMF_LINK_DLL_OUTPUT = $(outbase).map
+TOOL_GCC3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+        $(filter %.def, $(othersrc))
+TOOL_GCC3OMF_LINK_DLL_DEPORD =
+define TOOL_GCC3OMF_LINK_DLL_CMDS
+        $(TOOL_GCC3OMF_LD) $(TOOL_GCC3OMF_LDFLAGS.dll) $(flags) -o $(out) $(objs)\
+                $(filter %.def, $(othersrc))\
+                $(foreach p,$(libpath), -L$(p))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
+                $(call TOOL_GCC3_LD_MAP,$(outbase).map)
 endef
 
@@ -228 +210 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-define TOOL_GCC3OMF_LINK_SYSMOD
-#$ (warning dbg: TOOL_GCC3OMF_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))) $(filter %.def, $(othersrc)) | $(dirdep)
-        $(call MSG_L1,Creating Program $$@)
-ifneq ($(custom_pre),)
-        $(eval $(custom_pre))
-endif
-        $(TOOL_GCC3OMF_LD_SYSMOD) $(TOOL_GCC3OMF_LDFLAGS.sysmod) $(flags) -o $$@ $(objs) \
-                $(filter %.def, $(othersrc)) \
-                $(foreach p,$(libpath), -L$(p)) \
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib))) \
+TOOL_GCC3OMF_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_GCC3OMF_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
+         $(filter %.def, $(othersrc))
+TOOL_GCC3OMF_LINK_SYSMOD_DEPORD =
+define TOOL_GCC3OMF_LINK_SYSMOD_CMDS
+        $(TOOL_GCC3OMF_LD_SYSMOD) $(TOOL_GCC3OMF_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
+                $(filter %.def, $(othersrc))\
+                $(foreach p,$(libpath), -L$(p))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
                 $(call TOOL_GCC3_LD_SYSMOD_MAP,$(outbase).map)
-ifneq ($(custom_post),)
-        $(eval $(custom_post))
-endif
-_OUT_FILES += $(outbase).map
-
-endef
-
+endef
+