Changeset 971 for trunk/kBuild/tools/GXX.kmk

Timestamp:

May 27, 2007, 6:45:22 PM (18 years ago)

Author:

bird

Message:

GCC -> GXX. (the GCC is going to do plain C linking using gcc instead of g++ to fix these incorrect dependencies on the C++ RT when linking C progs.)

File:

• trunk/kBuild/tools/GXX.kmk (copied) (copied from trunk/kBuild/tools/GCC.kmk ) (9 diffs)

trunk/kBuild/tools/GXX.kmk

@@ -2 +2 @@
 ## @file
 #
-# kBuild Tool Config - Generic GCC Using The System GCC.
+# kBuild Tool Config - Generic GCC using the system GCC, for building C++ code.
 #
 # Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
@@ -25 +25 @@
 #
 
-TOOL_GCC := Generic GCC Using The System GCC.
+TOOL_GXX := Generic GCC using the system GCC, for building C++ code.
 
 # Tool Specific Properties
-TOOL_GCC_CC  ?= gcc$(HOSTSUFF_EXE)
-TOOL_GCC_CXX ?= g++$(HOSTSUFF_EXE)
-TOOL_GCC_AS  ?= gcc$(HOSTSUFF_EXE)
-TOOL_GCC_AR  ?= ar$(HOSTSUFF_EXE)
-TOOL_GCC_RANLIB ?= ranlib$(HOSTSUFF_EXE)
-TOOL_GCC_LD  ?= g++$(HOSTSUFF_EXE)
-TOOL_GCC_LDFLAGS.dll.os2 ?= -Zdll
-TOOL_GCC_LDFLAGS.dll.darwin ?= -dynamiclib
-ifndef TOOL_GCC_LDFLAGS.$(BUILD_TARGET)
-TOOL_GCC_LDFLAGS.dll ?= -shared
+TOOL_GXX_CC  ?= gcc$(HOSTSUFF_EXE)
+TOOL_GXX_CXX ?= g++$(HOSTSUFF_EXE)
+TOOL_GXX_AS  ?= gcc$(HOSTSUFF_EXE)
+TOOL_GXX_AR  ?= ar$(HOSTSUFF_EXE)
+TOOL_GXX_RANLIB ?= ranlib$(HOSTSUFF_EXE)
+TOOL_GXX_LD  ?= g++$(HOSTSUFF_EXE)
+TOOL_GXX_LDFLAGS.dll.os2 ?= -Zdll
+TOOL_GXX_LDFLAGS.dll.darwin ?= -dynamiclib
+ifndef TOOL_GXX_LDFLAGS.$(BUILD_TARGET)
+TOOL_GXX_LDFLAGS.dll ?= -shared
 else
-TOOL_GCC_LDFLAGS.dll ?= $(TOOL_GCC_LDFLAGS.$(BUILD_TARGET))
+TOOL_GXX_LDFLAGS.dll ?= $(TOOL_GXX_LDFLAGS.$(BUILD_TARGET))
 endif
 
 # General Properties used by kBuild
-TOOL_GCC_COBJSUFF         ?= .o
-TOOL_GCC_CFLAGS           ?=
-TOOL_GCC_CFLAGS.debug     ?= -g
-TOOL_GCC_CFLAGS.profile   ?= -g -O2 #-pg
-TOOL_GCC_CFLAGS.release   ?= -O2
-TOOL_GCC_CINCS            ?=
-TOOL_GCC_CDEFS            ?=
-
-TOOL_GCC_CXXOBJSUFF       ?= .o
-TOOL_GCC_CXXOBJSUFF       ?= .o
-TOOL_GCC_CXXFLAGS         ?=
-TOOL_GCC_CXXFLAGS.debug   ?= -g -O0
-TOOL_GCC_CXXFLAGS.profile ?= -g -O2 #-pg
-TOOL_GCC_CXXFLAGS.release ?= -O2
-TOOL_GCC_CXXINCS          ?=
-TOOL_GCC_CXXDEFS          ?=
-
-TOOL_GCC_ASFLAGS          ?= -x assembler-with-cpp
-TOOL_GCC_ASFLAGS.debug    ?= -g
-TOOL_GCC_ASFLAGS.profile  ?= -g
-TOOL_GCC_ASOBJSUFF        ?= .o
-
-TOOL_GCC_ARFLAGS          ?= cr
-TOOL_GCC_ARLIBSUFF        ?= .a
-
-TOOL_GCC_LDFLAGS          ?=
-TOOL_GCC_LDFLAGS.debug    ?= -g
-TOOL_GCC_LDFLAGS.profile  ?= -g
+TOOL_GXX_COBJSUFF         ?= .o
+TOOL_GXX_CFLAGS           ?=
+TOOL_GXX_CFLAGS.debug     ?= -g
+TOOL_GXX_CFLAGS.profile   ?= -g -O2 #-pg
+TOOL_GXX_CFLAGS.release   ?= -O2
+TOOL_GXX_CINCS            ?=
+TOOL_GXX_CDEFS            ?=
+
+TOOL_GXX_CXXOBJSUFF       ?= .o
+TOOL_GXX_CXXOBJSUFF       ?= .o
+TOOL_GXX_CXXFLAGS         ?=
+TOOL_GXX_CXXFLAGS.debug   ?= -g -O0
+TOOL_GXX_CXXFLAGS.profile ?= -g -O2 #-pg
+TOOL_GXX_CXXFLAGS.release ?= -O2
+TOOL_GXX_CXXINCS          ?=
+TOOL_GXX_CXXDEFS          ?=
+
+TOOL_GXX_ASFLAGS          ?= -x assembler-with-cpp
+TOOL_GXX_ASFLAGS.debug    ?= -g
+TOOL_GXX_ASFLAGS.profile  ?= -g
+TOOL_GXX_ASOBJSUFF        ?= .o
+
+TOOL_GXX_ARFLAGS          ?= cr
+TOOL_GXX_ARLIBSUFF        ?= .a
+
+TOOL_GXX_LDFLAGS          ?=
+TOOL_GXX_LDFLAGS.debug    ?= -g
+TOOL_GXX_LDFLAGS.profile  ?= -g
 
 
@@ -86 +86 @@
 # @param    $(objsuff)  Object suffix.
 #
-TOOL_GCC_COMPILE_C_OUTPUT =
-TOOL_GCC_COMPILE_C_DEPEND =
-TOOL_GCC_COMPILE_C_DEPORD =
-define TOOL_GCC_COMPILE_C_CMDS
-        $(QUIET)$(TOOL_GCC_CC) -c\
+TOOL_GXX_COMPILE_C_OUTPUT =
+TOOL_GXX_COMPILE_C_DEPEND =
+TOOL_GXX_COMPILE_C_DEPORD =
+define TOOL_GXX_COMPILE_C_CMDS
+        $(QUIET)$(TOOL_GXX_CC) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
@@ -111 +111 @@
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
 # @param    $(objsuff)  Object suffix.
-TOOL_GCC_COMPILE_CXX_OUTPUT =
-TOOL_GCC_COMPILE_CXX_DEPEND =
-TOOL_GCC_COMPILE_CXX_DEPORD =
-define TOOL_GCC_COMPILE_CXX_CMDS
-        $(QUIET)$(TOOL_GCC_CXX) -c\
+TOOL_GXX_COMPILE_CXX_OUTPUT =
+TOOL_GXX_COMPILE_CXX_DEPEND =
+TOOL_GXX_COMPILE_CXX_DEPORD =
+define TOOL_GXX_COMPILE_CXX_CMDS
+        $(QUIET)$(TOOL_GXX_CXX) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
@@ -136 +136 @@
 # @param    $(objsuff)  Object suffix.
 #
-TOOL_GCC_COMPILE_AS_OUTPUT =
-TOOL_GCC_COMPILE_AS_DEPEND =
-TOOL_GCC_COMPILE_AS_DEPORD =
-define TOOL_GCC_COMPILE_AS_CMDS
-        $(QUIET)$(TOOL_GCC_AS) -c\
+TOOL_GXX_COMPILE_AS_OUTPUT =
+TOOL_GXX_COMPILE_AS_DEPEND =
+TOOL_GXX_COMPILE_AS_DEPORD =
+define TOOL_GXX_COMPILE_AS_CMDS
+        $(QUIET)$(TOOL_GXX_AS) -c\
                 $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
                 -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
@@ -157 +157 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GCC_LINK_LIBRARY_OUTPUT =
-TOOL_GCC_LINK_LIBRARY_DEPEND =
-TOOL_GCC_LINK_LIBRARY_DEPORD =
-define TOOL_GCC_LINK_LIBRARY_CMDS
-        $(QUIET)$(TOOL_GCC_AR) $(flags) $(out) $(objs)
-        $(call xargs,$(QUIET)$(TOOL_GCC_AR) $(flags) $(out),$(objs))
+TOOL_GXX_LINK_LIBRARY_OUTPUT =
+TOOL_GXX_LINK_LIBRARY_DEPEND =
+TOOL_GXX_LINK_LIBRARY_DEPORD =
+define TOOL_GXX_LINK_LIBRARY_CMDS
+        $(QUIET)$(TOOL_GXX_AR) $(flags) $(out) $(objs)
+        $(call xargs,$(QUIET)$(TOOL_GXX_AR) $(flags) $(out),$(objs))
         $(foreach lib,$(othersrc)\
                 ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \
@@ -168 +168 @@
                 $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \
                 $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \
-                        && $(TOOL_GCC_AR) x $(abspath $(lib)) \
-                        && $(TOOL_GCC_AR) $(flags) $(out) *) \
+                        && $(TOOL_GXX_AR) x $(abspath $(lib)) \
+                        && $(TOOL_GXX_AR) $(flags) $(out) *) \
                 $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \
                 $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/)
-        $(QUIET)$(TOOL_GCC_RANLIB) $(out)
+        $(QUIET)$(TOOL_GXX_RANLIB) $(out)
 endef
 
@@ -190 +190 @@
 #
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-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
-        $(QUIET)$(TOOL_GCC_LD) $(flags) -o $(out) $(objs) \
+TOOL_GXX_LINK_PROGRAM_OUTPUT =
+TOOL_GXX_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GXX_LINK_PROGRAM_DEPORD =
+define TOOL_GXX_LINK_PROGRAM_CMDS
+        $(QUIET)$(TOOL_GXX_LD) $(flags) -o $(out) $(objs) \
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
 endef
@@ -212 +212 @@
 # @param    $(custom_post)  Custom step invoked after linking.
 # @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
-        $(QUIET)$(TOOL_GCC_LD) $(TOOL_GCC_LDFLAGS.dll) $(flags) -o $(out) $(objs) \
+TOOL_GXX_LINK_DLL_OUTPUT =
+TOOL_GXX_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
+TOOL_GXX_LINK_DLL_DEPORD =
+define TOOL_GXX_LINK_DLL_CMDS
+        $(QUIET)$(TOOL_GXX_LD) $(TOOL_GXX_LDFLAGS.dll) $(flags) -o $(out) $(objs) \
                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
 endef