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

Timestamp:

May 31, 2004, 4:19:05 AM (21 years ago)

Author:

bird

Message:

..

File:

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

trunk/kBuild/tools/GCC.kmk

@@ -26 +26 @@
 
 
-TOOL_GCC                := Generic GCC
+TOOL_GCC                    := Generic GCC
 
-TOOL_GCC_CC             := gcc$(HOSTSUFF_EXE)
-TOOL_GCC_COBJSUFF       := .o
-TOOL_GCC_CFLAGS         := -g
-TOOL_GCC_CFLAGS.debug   := -O0
-TOOL_GCC_CFLAGS.release := -O2
-TOOL_GCC_CFLAGS.profile := -pg
-TOOL_GCC_CINCS          :=
-TOOL_GCC_CDEFS          :=
+TOOL_GCC_CC                 := gcc$(HOSTSUFF_EXE)
+TOOL_GCC_COBJSUFF           := .o
+TOOL_GCC_CFLAGS             := -g
+TOOL_GCC_CFLAGS.debug       := -O0
+TOOL_GCC_CFLAGS.release     := -O2
+TOOL_GCC_CFLAGS.profile     := -pg
+TOOL_GCC_CINCS              :=
+TOOL_GCC_CDEFS              :=
 
-TOOL_GCC_CC             := gcc$(HOSTSUFF_EXE)
-TOOL_GCC_CXXOBJSUFF     := .o
+TOOL_GCC_CXX                := g++$(HOSTSUFF_EXE)
+TOOL_GCC_CXXOBJSUFF         := .o
+TOOL_GCC_CXXOBJSUFF         := .o
+TOOL_GCC_CXXFLAGS           := -g
+TOOL_GCC_CXXFLAGS.debug     := -O0
+TOOL_GCC_CXXFLAGS.release   := -O2
+TOOL_GCC_CXXFLAGS.profile   := -pg
+TOOL_GCC_CXXINCS            :=
+TOOL_GCC_CXXDEFS            :=
 
-TOOL_GCC_AS             := as$(HOSTSUFF_EXE)
-TOOL_GCC_ASOBJSUFF      := .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
+TOOL_GCC_AR                 := ar$(HOSTSUFF_EXE)
+TOOL_GCC_ARFLAGS            := cr
+TOOL_GCC_ARLIBSUFF          := .a
+
+TOOL_GCC_LD                 := g++$(HOSTSUFF_EXE)
+TOOL_GCC_LDFLAGS            :=
+TOOL_GCC_LDFLAGS.debug      := -g
+TOOL_GCC_LDFLAGS.release    := -s
 
 
@@ -61 +73 @@
 # @param        $(objsuff)  Object suffix.
 define TOOL_GCC_COMPILE_C
-#$ (warning dbg: GCC: target=$(target) source=$(source) obj=$(obj) dep=$(dep) flags=$(flags) defs=$(defs) incs=$(incs) dirdep=$(dirdep) outbase=$(outbase) objsuff=$(objsuff))
+#$ (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))
 $(obj): $(dirdep) $(PATH_CURRENT)/$(source)
         $(call MSG_L2,Compiling $$@ using GCC)
@@ -68 +80 @@
                 -Wp,-MT,$(dep) -Wp,-MD,$$@\
                 -o $$@\
-        $(PATH_CURRENT)/$(source)               
+                $(PATH_CURRENT)/$(source)               
                 
 endef
@@ -83 +95 @@
 # @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))
+#$ (warning dbg: TOOL_GCC_LINK_LIBRARY: target=$(target) lib=$(lib) objs=$(objs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) outbase=$(outbase))
 $(lib): $(dirdep) $(objs) $(deps)
         $(call MSG_L1,Creating Library $$@)
@@ -91 +103 @@
 endef
 
+
+## Link program
+# @param    $(target)   Normalized main target name.
+# @param    $(exe)              Program name.
+# @param    $(objs)     Object files to link together.
+# @param    $(libs)     Libraries to search.
+# @param    $(libpath)  Library search paths.
+# @param    $(flags)    Flags.
+# @param        $(dirdep)   Directory creation dependency.
+# @param        $(deps)         Other dependencies.
+# @param        $(deffile)  Definition file. (optional, PC only)
+# @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_PROGRAM
+#$ (warning dbg: TOOL_GCC_LINK_PROGRAM: target=$(target) exe=$(exe) objs=$(objs) libs=$(libs) deps=$(deps) flags=$(flags) dirdep=$(dirdep) deffile=$(deffile) outbase=$(outbase))
+$(exe): $(dirdep) $(objs) $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(deps)
+        $(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   
+        
+endef
+