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

Timestamp:

May 31, 2004, 3:11:52 AM (21 years ago)

Author:

bird

Message:

...

File:

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

trunk/kBuild/tools/GCC.kmk

@@ -27 +27 @@
 
 TOOL_GCC                := Generic GCC
+
 TOOL_GCC_CC             := gcc$(HOSTSUFF_EXE)
+TOOL_GCC_COBJSUFF       := .o
 TOOL_GCC_CFLAGS         := -g
 TOOL_GCC_CFLAGS.debug   := -O0
@@ -33 +35 @@
 TOOL_GCC_CFLAGS.profile := -pg
 TOOL_GCC_CINCS          :=
+TOOL_GCC_CDEFS          :=
+
+TOOL_GCC_CC             := gcc$(HOSTSUFF_EXE)
+TOOL_GCC_CXXOBJSUFF     := .o
+
+TOOL_GCC_AS             := as$(HOSTSUFF_EXE)
+TOOL_GCC_ASOBJSUFF      := .o
+
+TOOL_GCC_AR             := ar$(HOSTSUFF_EXE)
+TOOL_GCC_ARFLAGS        := cr
+TOOL_GCC_ARLIBSUFF      := .a
 
 
 ## Compile C source.
-# @param    $1  Output basename (full).
-# @param    $2  Source filename (relative).
-# @param    $3  Normalized main target name.
+# @param    $(target)   Normalized main target name.
+# @param    $(source)   Source filename (relative).
+# @param        $(obj)      Object file name. This shall be (re)created by the compilation.
+# @param    $(dep)          Dependcy file. This shall be (re)created by the compilation.
+# @param    $(flags)    Flags.
+# @param    $(defs)     Definitions. No -D or something.
+# @param    $(incs)     Includes. No -I or something.
+# @param        $(dirdep)   Directory creation dependency.
+#
+# @param    $(outbase)  Output basename (full). Use this for list files and such.
+# @param        $(objsuff)  Object suffix.
 define TOOL_GCC_COMPILE_C
-#$ (warning dbg GCC: 1=$1 2=$2 3=$3 4=$4 5=$5)
-$1.o: $(PATH_CURRENT)/$2 $(dir $1).dir_created
-        $(TOOL_GCC_CC) -c \
-                $($3_$2_CFLAGS) $($3_$2_CFLAGS.$(BUILD_TYPE)) \
-                $($2_CFLAGS) $($2_CFLAGS.$(BUILD_TYPE)) \
-                $($3_CFLAGS) $($3_CFLAGS.$(BUILD_TYPE)) \
-                $(TOOL_GCC_CFLAGS) $(TOOL_GCC_CFLAGS.$(BUILD_TYPE)) \
-                $(addprefix -I, $($3_$2_CINCS) $($3_$2_INCS) $($2_CINCS) $($2_INCS) $($3_CINCS) $($3_INCS) $(INCS) \
-                                                $(TOOL_GCC_CINCS)) \
-                $(addprefix -D, $($3_$2_CDEFS) $($3_$2_DEFS) $($2_CDEFS) $($2_DEFS) $($3_CDEFS) $($3_DEFS) $(DEFS) $(TOOL_GCC_CDEFS)) \
-                -o $$@ -Wp,-MT,$1$(SUFF_DEP) -Wp,-MD,$$@ \
-        $(PATH_CURRENT)/$2              
-_OBJS_$(3) += $1.o
-_DEPFILES += $1$(SUFF_DEP)
+#$ (warning dbg: GCC: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
+$(obj): $(dirdep) $(PATH_CURRENT)/$(source)
+        $(call MSG_L2,Compiling $$@ using GCC)
+        $(TOOL_GCC_CC) -c\
+                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
+                -Wp,-MT,$(dep) -Wp,-MD,$$@\
+                -o $$@\
+        $(PATH_CURRENT)/$(source)               
+                
 endef
 
+
+## Link library
+# @param    $(target)   Normalized main target name.
+# @param    $(lib)              Library name.
+# @param    $(objs)     Object files to put in the library.
+# @param    $(flags)    Flags.
+# @param        $(dirdep)   Directory creation dependency.
+# @param        $(deps)         Other dependencies.
+#
+# @param    $(outbase)  Output basename (full). Use this for list files and such.
+define TOOL_GCC_LINK_LIBRARY
+#$ (warning dbg: GCC: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
+$(lib): $(dirdep) $(objs) $(deps)
+        $(call MSG_L1,Creating Library $$@)
+        $(RM) -f $$@
+        $(TOOL_GCC_AR) $(flags) $$@ $(objs)
+        
+endef
+