Changeset 971


Ignore:
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.)

Location:
trunk/kBuild/tools
Files:
6 copied

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/GXX.kmk

    r965 r971  
    22## @file
    33#
    4 # kBuild Tool Config - Generic GCC Using The System GCC.
     4# kBuild Tool Config - Generic GCC using the system GCC, for building C++ code.
    55#
    66# Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC := Generic GCC Using The System GCC.
     27TOOL_GXX := Generic GCC using the system GCC, for building C++ code.
    2828
    2929# Tool Specific Properties
    30 TOOL_GCC_CC  ?= gcc$(HOSTSUFF_EXE)
    31 TOOL_GCC_CXX ?= g++$(HOSTSUFF_EXE)
    32 TOOL_GCC_AS  ?= gcc$(HOSTSUFF_EXE)
    33 TOOL_GCC_AR  ?= ar$(HOSTSUFF_EXE)
    34 TOOL_GCC_RANLIB ?= ranlib$(HOSTSUFF_EXE)
    35 TOOL_GCC_LD  ?= g++$(HOSTSUFF_EXE)
    36 TOOL_GCC_LDFLAGS.dll.os2 ?= -Zdll
    37 TOOL_GCC_LDFLAGS.dll.darwin ?= -dynamiclib
    38 ifndef TOOL_GCC_LDFLAGS.$(BUILD_TARGET)
    39 TOOL_GCC_LDFLAGS.dll ?= -shared
     30TOOL_GXX_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GXX_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GXX_AS  ?= gcc$(HOSTSUFF_EXE)
     33TOOL_GXX_AR  ?= ar$(HOSTSUFF_EXE)
     34TOOL_GXX_RANLIB ?= ranlib$(HOSTSUFF_EXE)
     35TOOL_GXX_LD  ?= g++$(HOSTSUFF_EXE)
     36TOOL_GXX_LDFLAGS.dll.os2 ?= -Zdll
     37TOOL_GXX_LDFLAGS.dll.darwin ?= -dynamiclib
     38ifndef TOOL_GXX_LDFLAGS.$(BUILD_TARGET)
     39TOOL_GXX_LDFLAGS.dll ?= -shared
    4040else
    41 TOOL_GCC_LDFLAGS.dll ?= $(TOOL_GCC_LDFLAGS.$(BUILD_TARGET))
     41TOOL_GXX_LDFLAGS.dll ?= $(TOOL_GXX_LDFLAGS.$(BUILD_TARGET))
    4242endif
    4343
    4444# General Properties used by kBuild
    45 TOOL_GCC_COBJSUFF         ?= .o
    46 TOOL_GCC_CFLAGS           ?=
    47 TOOL_GCC_CFLAGS.debug     ?= -g
    48 TOOL_GCC_CFLAGS.profile   ?= -g -O2 #-pg
    49 TOOL_GCC_CFLAGS.release   ?= -O2
    50 TOOL_GCC_CINCS            ?=
    51 TOOL_GCC_CDEFS            ?=
    52 
    53 TOOL_GCC_CXXOBJSUFF       ?= .o
    54 TOOL_GCC_CXXOBJSUFF       ?= .o
    55 TOOL_GCC_CXXFLAGS         ?=
    56 TOOL_GCC_CXXFLAGS.debug   ?= -g -O0
    57 TOOL_GCC_CXXFLAGS.profile ?= -g -O2 #-pg
    58 TOOL_GCC_CXXFLAGS.release ?= -O2
    59 TOOL_GCC_CXXINCS          ?=
    60 TOOL_GCC_CXXDEFS          ?=
    61 
    62 TOOL_GCC_ASFLAGS          ?= -x assembler-with-cpp
    63 TOOL_GCC_ASFLAGS.debug    ?= -g
    64 TOOL_GCC_ASFLAGS.profile  ?= -g
    65 TOOL_GCC_ASOBJSUFF        ?= .o
    66 
    67 TOOL_GCC_ARFLAGS          ?= cr
    68 TOOL_GCC_ARLIBSUFF        ?= .a
    69 
    70 TOOL_GCC_LDFLAGS          ?=
    71 TOOL_GCC_LDFLAGS.debug    ?= -g
    72 TOOL_GCC_LDFLAGS.profile  ?= -g
     45TOOL_GXX_COBJSUFF         ?= .o
     46TOOL_GXX_CFLAGS           ?=
     47TOOL_GXX_CFLAGS.debug     ?= -g
     48TOOL_GXX_CFLAGS.profile   ?= -g -O2 #-pg
     49TOOL_GXX_CFLAGS.release   ?= -O2
     50TOOL_GXX_CINCS            ?=
     51TOOL_GXX_CDEFS            ?=
     52
     53TOOL_GXX_CXXOBJSUFF       ?= .o
     54TOOL_GXX_CXXOBJSUFF       ?= .o
     55TOOL_GXX_CXXFLAGS         ?=
     56TOOL_GXX_CXXFLAGS.debug   ?= -g -O0
     57TOOL_GXX_CXXFLAGS.profile ?= -g -O2 #-pg
     58TOOL_GXX_CXXFLAGS.release ?= -O2
     59TOOL_GXX_CXXINCS          ?=
     60TOOL_GXX_CXXDEFS          ?=
     61
     62TOOL_GXX_ASFLAGS          ?= -x assembler-with-cpp
     63TOOL_GXX_ASFLAGS.debug    ?= -g
     64TOOL_GXX_ASFLAGS.profile  ?= -g
     65TOOL_GXX_ASOBJSUFF        ?= .o
     66
     67TOOL_GXX_ARFLAGS          ?= cr
     68TOOL_GXX_ARLIBSUFF        ?= .a
     69
     70TOOL_GXX_LDFLAGS          ?=
     71TOOL_GXX_LDFLAGS.debug    ?= -g
     72TOOL_GXX_LDFLAGS.profile  ?= -g
    7373
    7474
    … …  
    8686# @param    $(objsuff)  Object suffix.
    8787#
    88 TOOL_GCC_COMPILE_C_OUTPUT =
    89 TOOL_GCC_COMPILE_C_DEPEND =
    90 TOOL_GCC_COMPILE_C_DEPORD =
    91 define TOOL_GCC_COMPILE_C_CMDS
    92         $(QUIET)$(TOOL_GCC_CC) -c\
     88TOOL_GXX_COMPILE_C_OUTPUT =
     89TOOL_GXX_COMPILE_C_DEPEND =
     90TOOL_GXX_COMPILE_C_DEPORD =
     91define TOOL_GXX_COMPILE_C_CMDS
     92        $(QUIET)$(TOOL_GXX_CC) -c\
    9393                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    9494                -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
    … …  
    111111# @param    $(outbase)  Output basename (full). Use this for list files and such.
    112112# @param    $(objsuff)  Object suffix.
    113 TOOL_GCC_COMPILE_CXX_OUTPUT =
    114 TOOL_GCC_COMPILE_CXX_DEPEND =
    115 TOOL_GCC_COMPILE_CXX_DEPORD =
    116 define TOOL_GCC_COMPILE_CXX_CMDS
    117         $(QUIET)$(TOOL_GCC_CXX) -c\
     113TOOL_GXX_COMPILE_CXX_OUTPUT =
     114TOOL_GXX_COMPILE_CXX_DEPEND =
     115TOOL_GXX_COMPILE_CXX_DEPORD =
     116define TOOL_GXX_COMPILE_CXX_CMDS
     117        $(QUIET)$(TOOL_GXX_CXX) -c\
    118118                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    119119                -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
    … …  
    136136# @param    $(objsuff)  Object suffix.
    137137#
    138 TOOL_GCC_COMPILE_AS_OUTPUT =
    139 TOOL_GCC_COMPILE_AS_DEPEND =
    140 TOOL_GCC_COMPILE_AS_DEPORD =
    141 define TOOL_GCC_COMPILE_AS_CMDS
    142         $(QUIET)$(TOOL_GCC_AS) -c\
     138TOOL_GXX_COMPILE_AS_OUTPUT =
     139TOOL_GXX_COMPILE_AS_DEPEND =
     140TOOL_GXX_COMPILE_AS_DEPORD =
     141define TOOL_GXX_COMPILE_AS_CMDS
     142        $(QUIET)$(TOOL_GXX_AS) -c\
    143143                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    144144                -Wp,-MD,$(dep) -Wp,-MT,$(obj) \
    … …  
    157157#
    158158# @param    $(outbase)  Output basename (full). Use this for list files and such.
    159 TOOL_GCC_LINK_LIBRARY_OUTPUT =
    160 TOOL_GCC_LINK_LIBRARY_DEPEND =
    161 TOOL_GCC_LINK_LIBRARY_DEPORD =
    162 define TOOL_GCC_LINK_LIBRARY_CMDS
    163         $(QUIET)$(TOOL_GCC_AR) $(flags) $(out) $(objs)
    164         $(call xargs,$(QUIET)$(TOOL_GCC_AR) $(flags) $(out),$(objs))
     159TOOL_GXX_LINK_LIBRARY_OUTPUT =
     160TOOL_GXX_LINK_LIBRARY_DEPEND =
     161TOOL_GXX_LINK_LIBRARY_DEPORD =
     162define TOOL_GXX_LINK_LIBRARY_CMDS
     163        $(QUIET)$(TOOL_GXX_AR) $(flags) $(out) $(objs)
     164        $(call xargs,$(QUIET)$(TOOL_GXX_AR) $(flags) $(out),$(objs))
    165165        $(foreach lib,$(othersrc)\
    166166                ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \
    … …  
    168168                $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \
    169169                $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \
    170                         && $(TOOL_GCC_AR) x $(abspath $(lib)) \
    171                         && $(TOOL_GCC_AR) $(flags) $(out) *) \
     170                        && $(TOOL_GXX_AR) x $(abspath $(lib)) \
     171                        && $(TOOL_GXX_AR) $(flags) $(out) *) \
    172172                $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \
    173173                $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/)
    174         $(QUIET)$(TOOL_GCC_RANLIB) $(out)
     174        $(QUIET)$(TOOL_GXX_RANLIB) $(out)
    175175endef
    176176
    … …  
    190190#
    191191# @param    $(outbase)  Output basename (full). Use this for list files and such.
    192 TOOL_GCC_LINK_PROGRAM_OUTPUT =
    193 TOOL_GCC_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    194 TOOL_GCC_LINK_PROGRAM_DEPORD =
    195 define TOOL_GCC_LINK_PROGRAM_CMDS
    196         $(QUIET)$(TOOL_GCC_LD) $(flags) -o $(out) $(objs) \
     192TOOL_GXX_LINK_PROGRAM_OUTPUT =
     193TOOL_GXX_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     194TOOL_GXX_LINK_PROGRAM_DEPORD =
     195define TOOL_GXX_LINK_PROGRAM_CMDS
     196        $(QUIET)$(TOOL_GXX_LD) $(flags) -o $(out) $(objs) \
    197197                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
    198198endef
    … …  
    212212# @param    $(custom_post)  Custom step invoked after linking.
    213213# @param    $(outbase)      Output basename (full). Use this for list files and such.
    214 TOOL_GCC_LINK_DLL_OUTPUT =
    215 TOOL_GCC_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    216 TOOL_GCC_LINK_DLL_DEPORD =
    217 define TOOL_GCC_LINK_DLL_CMDS
    218         $(QUIET)$(TOOL_GCC_LD) $(TOOL_GCC_LDFLAGS.dll) $(flags) -o $(out) $(objs) \
     214TOOL_GXX_LINK_DLL_OUTPUT =
     215TOOL_GXX_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     216TOOL_GXX_LINK_DLL_DEPORD =
     217define TOOL_GXX_LINK_DLL_CMDS
     218        $(QUIET)$(TOOL_GXX_LD) $(TOOL_GXX_LDFLAGS.dll) $(flags) -o $(out) $(objs) \
    219219                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
    220220endef

  • trunk/kBuild/tools/GXX3.kmk

    r965 r971  
    22## @file
    33#
    4 # kBuild Tool Config - Generic GCC v3.2.x or later Using The System GCC and Binutils.
     4# kBuild Tool Config - Generic GCC v3.2.x using the system GCC and Binutils, for building C++ code.
    55#
    66# Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC3 := Generic GCC v3.2.x or later Using The System GCC and Binutils.
     27TOOL_GXX3 := Generic GCC v3.2.x or later using the system GCC and Binutils, for building C++ code.
    2828
    2929# Tool Specific Properties
    30 TOOL_GCC3_CC  ?= gcc$(HOSTSUFF_EXE)
    31 TOOL_GCC3_CXX ?= g++$(HOSTSUFF_EXE)
    32 TOOL_GCC3_AS  ?= gcc$(HOSTSUFF_EXE)
    33 ifeq ($(BUILD_TARGET),solaris) ## @todo drop the MRI script!
    34  TOOL_GCC3_AR ?= gar$(HOSTSUFF_EXE)
    35 else
    36  TOOL_GCC3_AR ?= ar$(HOSTSUFF_EXE)
     30TOOL_GXX3_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GXX3_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GXX3_AS  ?= gcc$(HOSTSUFF_EXE)
     33ifeq ($(BUILD_TARGET),solaris)
     34 TOOL_GXX3_AR ?= gar$(HOSTSUFF_EXE)
     35else
     36 TOOL_GXX3_AR ?= ar$(HOSTSUFF_EXE)
    3737endif
    3838ifeq ($(BUILD_TARGET),os2)
    39  TOOL_GCC3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
    40 else
    41  TOOL_GCC3_AR_IMP ?= $(ECHO) not supported!
    42 endif
    43 TOOL_GCC3_LD ?= g++$(HOSTSUFF_EXE)
    44 TOOL_GCC3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    45 ifndef TOOL_GCC3_LDFLAGS.$(BUILD_TARGET)
    46  TOOL_GCC3_LDFLAGS.dll ?= -shared
    47 else
    48  TOOL_GCC3_LDFLAGS.dll ?= $(TOOL_GCC3_LDFLAGS.$(BUILD_TARGET))
    49 endif
    50 TOOL_GCC3_LDFLAGS.sysmod ?= -r
    51 TOOL_GCC3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     39 TOOL_GXX3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
     40else
     41 TOOL_GXX3_AR_IMP ?= $(ECHO) not supported!
     42endif
     43TOOL_GXX3_LD ?= g++$(HOSTSUFF_EXE)
     44TOOL_GXX3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
     45ifndef TOOL_GXX3_LDFLAGS.$(BUILD_TARGET)
     46 TOOL_GXX3_LDFLAGS.dll ?= -shared
     47else
     48 TOOL_GXX3_LDFLAGS.dll ?= $(TOOL_GXX3_LDFLAGS.$(BUILD_TARGET))
     49endif
     50TOOL_GXX3_LDFLAGS.sysmod ?= -r
     51TOOL_GXX3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5252ifeq ($(BUILD_TARGET),os2)
    53  TOOL_GCC3_LD_MAP ?= -Zmap=$(1)
    54  TOOL_GCC3_LD_SYSMOD_MAP ?= -Zmap=$(1)
     53 TOOL_GXX3_LD_MAP ?= -Zmap=$(1)
     54 TOOL_GXX3_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5555endif
    5656ifdef SLKRUNS
    57  TOOL_GCC3_CC  += -fmessage-length=0
    58  TOOL_GCC3_CXX += -fmessage-length=0
     57 TOOL_GXX3_CC  += -fmessage-length=0
     58 TOOL_GXX3_CXX += -fmessage-length=0
    5959endif
    6060
    6161# General Properties used by kBuild
    62 TOOL_GCC3_COBJSUFF         ?= .o
    63 TOOL_GCC3_CFLAGS           ?=
    64 TOOL_GCC3_CFLAGS.debug     ?= -g
    65 TOOL_GCC3_CFLAGS.profile   ?= -g -O2 #-pg
    66 TOOL_GCC3_CFLAGS.release   ?= -O2
    67 TOOL_GCC3_CINCS            ?=
    68 TOOL_GCC3_CDEFS            ?=
    69 
    70 TOOL_GCC3_CXXOBJSUFF       ?= .o
    71 TOOL_GCC3_CXXOBJSUFF       ?= .o
    72 TOOL_GCC3_CXXFLAGS         ?=
    73 TOOL_GCC3_CXXFLAGS.debug   ?= -g
    74 TOOL_GCC3_CXXFLAGS.profile ?= -g -O2 #-pg
    75 TOOL_GCC3_CXXFLAGS.release ?= -O2
    76 TOOL_GCC3_CXXINCS          ?=
    77 TOOL_GCC3_CXXDEFS          ?=
    78 
    79 TOOL_GCC3_ASFLAGS          ?= -x assembler-with-cpp
    80 TOOL_GCC3_ASFLAGS.debug    ?= -g
    81 TOOL_GCC3_ASFLAGS.profile  ?= -g
    82 TOOL_GCC3_ASOBJSUFF        ?= .o
    83 
    84 TOOL_GCC3_ARFLAGS          ?= cr
    85 TOOL_GCC3_ARLIBSUFF        ?= .a
    86 
    87 TOOL_GCC3_LDFLAGS          ?=
    88 TOOL_GCC3_LDFLAGS.debug    ?= -g
    89 TOOL_GCC3_LDFLAGS.profile  ?= -g
     62TOOL_GXX3_COBJSUFF         ?= .o
     63TOOL_GXX3_CFLAGS           ?=
     64TOOL_GXX3_CFLAGS.debug     ?= -g
     65TOOL_GXX3_CFLAGS.profile   ?= -g -O2 #-pg
     66TOOL_GXX3_CFLAGS.release   ?= -O2
     67TOOL_GXX3_CINCS            ?=
     68TOOL_GXX3_CDEFS            ?=
     69
     70TOOL_GXX3_CXXOBJSUFF       ?= .o
     71TOOL_GXX3_CXXOBJSUFF       ?= .o
     72TOOL_GXX3_CXXFLAGS         ?=
     73TOOL_GXX3_CXXFLAGS.debug   ?= -g
     74TOOL_GXX3_CXXFLAGS.profile ?= -g -O2 #-pg
     75TOOL_GXX3_CXXFLAGS.release ?= -O2
     76TOOL_GXX3_CXXINCS          ?=
     77TOOL_GXX3_CXXDEFS          ?=
     78
     79TOOL_GXX3_ASFLAGS          ?= -x assembler-with-cpp
     80TOOL_GXX3_ASFLAGS.debug    ?= -g
     81TOOL_GXX3_ASFLAGS.profile  ?= -g
     82TOOL_GXX3_ASOBJSUFF        ?= .o
     83
     84TOOL_GXX3_ARFLAGS          ?= cr
     85TOOL_GXX3_ARLIBSUFF        ?= .a
     86
     87TOOL_GXX3_LDFLAGS          ?=
     88TOOL_GXX3_LDFLAGS.debug    ?= -g
     89TOOL_GXX3_LDFLAGS.profile  ?= -g
    9090
    9191
    … …  
    103103# @param    $(outbase)  Output basename (full). Use this for list files and such.
    104104# @param    $(objsuff)  Object suffix.
    105 TOOL_GCC3_COMPILE_C_OUTPUT =
    106 TOOL_GCC3_COMPILE_C_DEPEND =
    107 TOOL_GCC3_COMPILE_C_DEPORD =
    108 define TOOL_GCC3_COMPILE_C_CMDS
    109         $(QUIET)$(TOOL_GCC3_CC) -c\
     105TOOL_GXX3_COMPILE_C_OUTPUT =
     106TOOL_GXX3_COMPILE_C_DEPEND =
     107TOOL_GXX3_COMPILE_C_DEPORD =
     108define TOOL_GXX3_COMPILE_C_CMDS
     109        $(QUIET)$(TOOL_GXX3_CC) -c\
    110110                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    111111                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    127127# @param    $(outbase)  Output basename (full). Use this for list files and such.
    128128# @param    $(objsuff)  Object suffix.
    129 TOOL_GCC3_COMPILE_CXX_OUTPUT =
    130 TOOL_GCC3_COMPILE_CXX_DEPEND =
    131 TOOL_GCC3_COMPILE_CXX_DEPORD =
    132 define TOOL_GCC3_COMPILE_CXX_CMDS
    133         $(QUIET)$(TOOL_GCC3_CXX) -c\
     129TOOL_GXX3_COMPILE_CXX_OUTPUT =
     130TOOL_GXX3_COMPILE_CXX_DEPEND =
     131TOOL_GXX3_COMPILE_CXX_DEPORD =
     132define TOOL_GXX3_COMPILE_CXX_CMDS
     133        $(QUIET)$(TOOL_GXX3_CXX) -c\
    134134                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    135135                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    152152# @param    $(objsuff)  Object suffix.
    153153#
    154 TOOL_GCC3_COMPILE_AS_OUTPUT =
    155 TOOL_GCC3_COMPILE_AS_DEPEND =
    156 TOOL_GCC3_COMPILE_AS_DEPORD =
    157 define TOOL_GCC3_COMPILE_AS_CMDS
    158         $(QUIET)$(TOOL_GCC3_AS) -c\
     154TOOL_GXX3_COMPILE_AS_OUTPUT =
     155TOOL_GXX3_COMPILE_AS_DEPEND =
     156TOOL_GXX3_COMPILE_AS_DEPORD =
     157define TOOL_GXX3_COMPILE_AS_CMDS
     158        $(QUIET)$(TOOL_GXX3_AS) -c\
    159159                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    160160                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    173173# @param    $(othersrc) Unhandled sources.
    174174# @param    $(outbase)  Output basename (full). Use this for list files and such.
    175 TOOL_GCC3_LINK_LIBRARY_OUTPUT = $(out).ar-script $(outbase).imp.a
    176 TOOL_GCC3_LINK_LIBRARY_DEPEND = $(othersrc)
    177 TOOL_GCC3_LINK_LIBRARY_DEPORD =
     175TOOL_GXX3_LINK_LIBRARY_OUTPUT = $(out).ar-script $(outbase).imp.a
     176TOOL_GXX3_LINK_LIBRARY_DEPEND = $(othersrc)
     177TOOL_GXX3_LINK_LIBRARY_DEPORD =
    178178ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
    179 define TOOL_GCC3_LINK_LIBRARY_CMDS
     179define TOOL_GXX3_LINK_LIBRARY_CMDS
    180180        $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
    181181        $(QUIET)$(APPEND) -n $(out).ar-script \
    … …  
    183183                $(foreach o,$(filter-out %.def %.imp,$(othersrc)), 'ADDLIB $(o)')
    184184        $(if $(filter %.def %.imp,$(othersrc))\
    185                 ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
     185                ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
    186186                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script 'ADDLIB $(outbase).imp.a')
    187187        $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
    188188        $(QUIET)$(APPEND) $(out).ar-script 'END'
    189         $(QUIET)$(TOOL_GCC3_AR) -M < $(out).ar-script
    190 endef
    191 else
    192 define TOOL_GCC3_LINK_LIBRARY_CMDS
     189        $(QUIET)$(TOOL_GXX3_AR) -M < $(out).ar-script
     190endef
     191else
     192define TOOL_GXX3_LINK_LIBRARY_CMDS
    193193        $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
    194194        $(foreach o, $(objs)\
    … …  
    197197                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
    198198        $(if $(filter %.def %.imp,$(othersrc))\
    199                 ,$(TOOL_GCC3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
     199                ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
    200200                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(outbase).imp.a")
    201201        $(QUIET)$(APPEND) $(out).ar-script "SAVE"
    202202        $(QUIET)$(APPEND) $(out).ar-script "END"
    203         $(QUIET)$(TOOL_GCC3_AR) -M < $(out).ar-script
     203        $(QUIET)$(TOOL_GXX3_AR) -M < $(out).ar-script
    204204endef
    205205endif
    … …  
    219219# @param    $(custom_post)  Custom step invoked after linking.
    220220# @param    $(outbase)  Output basename (full). Use this for list files and such.
    221 TOOL_GCC3_LINK_PROGRAM_OUTPUT = $(outbase).map
    222 TOOL_GCC3_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
     221TOOL_GXX3_LINK_PROGRAM_OUTPUT = $(outbase).map
     222TOOL_GXX3_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    223223                $(filter %.def, $(othersrc))
    224 TOOL_GCC3_LINK_PROGRAM_DEPORD =
    225 define TOOL_GCC3_LINK_PROGRAM_CMDS
    226         $(QUIET)$(TOOL_GCC3_LD) $(flags) -o $(out) $(objs)\
     224TOOL_GXX3_LINK_PROGRAM_DEPORD =
     225define TOOL_GXX3_LINK_PROGRAM_CMDS
     226        $(QUIET)$(TOOL_GXX3_LD) $(flags) -o $(out) $(objs)\
    227227                $(filter %.def, $(othersrc))\
    228228                $(foreach p,$(libpath), -L$(p))\
    229229                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    230                 $(call TOOL_GCC3_LD_MAP,$(outbase).map)
     230                $(call TOOL_GXX3_LD_MAP,$(outbase).map)
    231231endef
    232232
    … …  
    245245# @param    $(custom_post)  Custom step invoked after linking.
    246246# @param    $(outbase)  Output basename (full). Use this for list files and such.
    247 TOOL_GCC3_LINK_DLL_OUTPUT = $(outbase).map
    248 TOOL_GCC3_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
     247TOOL_GXX3_LINK_DLL_OUTPUT = $(outbase).map
     248TOOL_GXX3_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    249249                $(filter %.def, $(othersrc))
    250 TOOL_GCC3_LINK_DLL_DEPORD =
    251 define TOOL_GCC3_LINK_DLL_CMDS
    252         $(QUIET)$(TOOL_GCC3_LD) $(TOOL_GCC3_LDFLAGS.dll) $(flags) -o $(out)\
    253                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(out)))\
     250TOOL_GXX3_LINK_DLL_DEPORD =
     251define TOOL_GXX3_LINK_DLL_CMDS
     252        $(QUIET)$(TOOL_GXX3_LD) $(TOOL_GXX3_LDFLAGS.dll) $(flags) -o $(out)\
     253                $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GXX3_LD_SONAME,$(target),$(out)))\
    254254                $(objs)\
    255255                $(filter %.def, $(othersrc))\
    256256                $(foreach p,$(libpath), -L$(p))\
    257257                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    258                 $(call TOOL_GCC3_LD_MAP,$(outbase).map)
     258                $(call TOOL_GXX3_LD_MAP,$(outbase).map)
    259259endef
    260260
    … …  
    273273# @param    $(custom_post)  Custom step invoked after linking.
    274274# @param    $(outbase)  Output basename (full). Use this for list files and such.
    275 TOOL_GCC3_LINK_SYSMOD_OUTPUT = $(outbase).map
    276 TOOL_GCC3_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
     275TOOL_GXX3_LINK_SYSMOD_OUTPUT = $(outbase).map
     276TOOL_GXX3_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    277277                $(filter %.def, $(othersrc))
    278 TOOL_GCC3_LINK_SYSMOD_DEPORD =
    279 define TOOL_GCC3_LINK_SYSMOD_CMDS
    280         $(QUIET)$(TOOL_GCC3_LD_SYSMOD) $(TOOL_GCC3_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
     278TOOL_GXX3_LINK_SYSMOD_DEPORD =
     279define TOOL_GXX3_LINK_SYSMOD_CMDS
     280        $(QUIET)$(TOOL_GXX3_LD_SYSMOD) $(TOOL_GXX3_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
    281281                $(filter %.def, $(othersrc))\
    282282                $(foreach p,$(libpath), -L$(p))\
    283283                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    284                 $(call TOOL_GCC3_LD_SYSMOD_MAP,$(outbase).map)
    285 endef
    286 
     284                $(call TOOL_GXX3_LD_SYSMOD_MAP,$(outbase).map)
     285endef
     286

  • trunk/kBuild/tools/GXX32.kmk

    r965 r971  
    22## @file
    33#
    4 # kBuild Tool Config - Generic 32-bit GCC v3.2.x or later Using The System GCC.
     4# kBuild Tool Config - Generic 32-bit GCC v3.2.x or later using the system GCC, for building C++ code.
    55#
    66# Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC32 := Generic 32-bit GCC v3.2.x or later Using The System GCC. \
     27TOOL_GXX32 := Generic 32-bit GCC v3.2.x or later using the system GCC, for building C++ code. \
    2828        More or less Linux/ELF specfic.
    2929
    3030# Tool Specific Properties
    31 TOOL_GCC32_CC  ?= gcc$(HOSTSUFF_EXE) -m32
    32 TOOL_GCC32_CXX ?= g++$(HOSTSUFF_EXE) -m32
    33 TOOL_GCC32_AS  ?= gcc$(HOSTSUFF_EXE) -m32
    34 TOOL_GCC32_AR  ?= ar$(HOSTSUFF_EXE)
    35 TOOL_GCC32_LD  ?= g++$(HOSTSUFF_EXE) -m32
    36 TOOL_GCC32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    37 ifndef TOOL_GCC32_LDFLAGS.$(BUILD_TARGET)
    38 TOOL_GCC32_LDFLAGS.dll ?= -shared
    39 else
    40 TOOL_GCC32_LDFLAGS.dll ?= $(TOOL_GCC32_LDFLAGS.$(BUILD_TARGET))
    41 endif
    42 TOOL_GCC32_LDFLAGS.sysmod ?= -r -m elf_i386
    43 TOOL_GCC32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     31TOOL_GXX32_CC  ?= gcc$(HOSTSUFF_EXE) -m32
     32TOOL_GXX32_CXX ?= g++$(HOSTSUFF_EXE) -m32
     33TOOL_GXX32_AS  ?= gcc$(HOSTSUFF_EXE) -m32
     34TOOL_GXX32_AR  ?= ar$(HOSTSUFF_EXE)
     35TOOL_GXX32_LD  ?= g++$(HOSTSUFF_EXE) -m32
     36TOOL_GXX32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
     37ifndef TOOL_GXX32_LDFLAGS.$(BUILD_TARGET)
     38TOOL_GXX32_LDFLAGS.dll ?= -shared
     39else
     40TOOL_GXX32_LDFLAGS.dll ?= $(TOOL_GXX32_LDFLAGS.$(BUILD_TARGET))
     41endif
     42TOOL_GXX32_LDFLAGS.sysmod ?= -r -m elf_i386
     43TOOL_GXX32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    4444ifeq ($(BUILD_TARGET),os2)
    45 TOOL_GCC32_LD_MAP ?= -Zmap=$(1)
    46 else
    47 TOOL_GCC32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     45TOOL_GXX32_LD_MAP ?= -Zmap=$(1)
     46else
     47TOOL_GXX32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    4848endif
    4949ifeq ($(BUILD_TARGET),os2)
    50 TOOL_GCC32_LD_SYSMOD_MAP ?= -Zmap=$(1)
    51 else
    52 TOOL_GCC32_LD_SYSMOD_MAP ?= -Map $(1) --cref
     50TOOL_GXX32_LD_SYSMOD_MAP ?= -Zmap=$(1)
     51else
     52TOOL_GXX32_LD_SYSMOD_MAP ?= -Map $(1) --cref
    5353endif
    5454ifdef SLKRUNS
    55 TOOL_GCC32_CC  += -fmessage-length=0
    56 TOOL_GCC32_CXX += -fmessage-length=0
     55TOOL_GXX32_CC  += -fmessage-length=0
     56TOOL_GXX32_CXX += -fmessage-length=0
    5757endif
    5858
    5959# General Properties used by kBuild
    60 TOOL_GCC32_COBJSUFF         ?= .o
    61 TOOL_GCC32_CFLAGS           ?=
    62 TOOL_GCC32_CFLAGS.debug     ?= -g
    63 TOOL_GCC32_CFLAGS.profile   ?= -g -O2 #-pg
    64 TOOL_GCC32_CFLAGS.release   ?= -O2
    65 TOOL_GCC32_CINCS            ?=
    66 TOOL_GCC32_CDEFS            ?=
    67 
    68 TOOL_GCC32_CXXOBJSUFF       ?= .o
    69 TOOL_GCC32_CXXOBJSUFF       ?= .o
    70 TOOL_GCC32_CXXFLAGS         ?=
    71 TOOL_GCC32_CXXFLAGS.debug   ?= -g
    72 TOOL_GCC32_CXXFLAGS.profile ?= -g -O2 #-pg
    73 TOOL_GCC32_CXXFLAGS.release ?= -O2
    74 TOOL_GCC32_CXXINCS          ?=
    75 TOOL_GCC32_CXXDEFS          ?=
    76 
    77 TOOL_GCC32_ASFLAGS          ?= -x assembler-with-cpp
    78 TOOL_GCC32_ASFLAGS.debug    ?= -g
    79 TOOL_GCC32_ASFLAGS.profile  ?= -g
    80 TOOL_GCC32_ASOBJSUFF        ?= .o
    81 
    82 TOOL_GCC32_ARFLAGS          ?= cr
    83 TOOL_GCC32_ARLIBSUFF        ?= .a
    84 
    85 TOOL_GCC32_LDFLAGS          ?=
    86 TOOL_GCC32_LDFLAGS.debug    ?= -g
    87 TOOL_GCC32_LDFLAGS.profile  ?= -g
     60TOOL_GXX32_COBJSUFF         ?= .o
     61TOOL_GXX32_CFLAGS           ?=
     62TOOL_GXX32_CFLAGS.debug     ?= -g
     63TOOL_GXX32_CFLAGS.profile   ?= -g -O2 #-pg
     64TOOL_GXX32_CFLAGS.release   ?= -O2
     65TOOL_GXX32_CINCS            ?=
     66TOOL_GXX32_CDEFS            ?=
     67
     68TOOL_GXX32_CXXOBJSUFF       ?= .o
     69TOOL_GXX32_CXXOBJSUFF       ?= .o
     70TOOL_GXX32_CXXFLAGS         ?=
     71TOOL_GXX32_CXXFLAGS.debug   ?= -g
     72TOOL_GXX32_CXXFLAGS.profile ?= -g -O2 #-pg
     73TOOL_GXX32_CXXFLAGS.release ?= -O2
     74TOOL_GXX32_CXXINCS          ?=
     75TOOL_GXX32_CXXDEFS          ?=
     76
     77TOOL_GXX32_ASFLAGS          ?= -x assembler-with-cpp
     78TOOL_GXX32_ASFLAGS.debug    ?= -g
     79TOOL_GXX32_ASFLAGS.profile  ?= -g
     80TOOL_GXX32_ASOBJSUFF        ?= .o
     81
     82TOOL_GXX32_ARFLAGS          ?= cr
     83TOOL_GXX32_ARLIBSUFF        ?= .a
     84
     85TOOL_GXX32_LDFLAGS          ?=
     86TOOL_GXX32_LDFLAGS.debug    ?= -g
     87TOOL_GXX32_LDFLAGS.profile  ?= -g
    8888
    8989
    … …  
    101101# @param    $(outbase)  Output basename (full). Use this for list files and such.
    102102# @param    $(objsuff)  Object suffix.
    103 TOOL_GCC32_COMPILE_C_OUTPUT =
    104 TOOL_GCC32_COMPILE_C_DEPEND =
    105 TOOL_GCC32_COMPILE_C_DEPORD =
    106 define TOOL_GCC32_COMPILE_C_CMDS
    107         $(QUIET)$(TOOL_GCC32_CC) -c\
     103TOOL_GXX32_COMPILE_C_OUTPUT =
     104TOOL_GXX32_COMPILE_C_DEPEND =
     105TOOL_GXX32_COMPILE_C_DEPORD =
     106define TOOL_GXX32_COMPILE_C_CMDS
     107        $(QUIET)$(TOOL_GXX32_CC) -c\
    108108                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    109109                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    125125# @param    $(outbase)  Output basename (full). Use this for list files and such.
    126126# @param    $(objsuff)  Object suffix.
    127 TOOL_GCC32_COMPILE_CXX_OUTPUT =
    128 TOOL_GCC32_COMPILE_CXX_DEPEND =
    129 TOOL_GCC32_COMPILE_CXX_DEPORD =
    130 define TOOL_GCC32_COMPILE_CXX_CMDS
    131         $(QUIET)$(TOOL_GCC32_CXX) -c\
     127TOOL_GXX32_COMPILE_CXX_OUTPUT =
     128TOOL_GXX32_COMPILE_CXX_DEPEND =
     129TOOL_GXX32_COMPILE_CXX_DEPORD =
     130define TOOL_GXX32_COMPILE_CXX_CMDS
     131        $(QUIET)$(TOOL_GXX32_CXX) -c\
    132132                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    133133                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    150150# @param    $(objsuff)  Object suffix.
    151151#
    152 TOOL_GCC32_COMPILE_AS_OUTPUT =
    153 TOOL_GCC32_COMPILE_AS_DEPEND =
    154 TOOL_GCC32_COMPILE_AS_DEPORD =
    155 define TOOL_GCC32_COMPILE_AS_CMDS
    156         $(QUIET)$(TOOL_GCC32_AS) -c\
     152TOOL_GXX32_COMPILE_AS_OUTPUT =
     153TOOL_GXX32_COMPILE_AS_DEPEND =
     154TOOL_GXX32_COMPILE_AS_DEPORD =
     155define TOOL_GXX32_COMPILE_AS_CMDS
     156        $(QUIET)$(TOOL_GXX32_AS) -c\
    157157                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    158158                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    171171# @param    $(othersrc) Unhandled sources.
    172172# @param    $(outbase)  Output basename (full). Use this for list files and such.
    173 TOOL_GCC32_LINK_LIBRARY_OUTPUT = $(out).ar-script
    174 TOOL_GCC32_LINK_LIBRARY_DEPEND = $(othersrc)
    175 TOOL_GCC32_LINK_LIBRARY_DEPORD =
     173TOOL_GXX32_LINK_LIBRARY_OUTPUT = $(out).ar-script
     174TOOL_GXX32_LINK_LIBRARY_DEPEND = $(othersrc)
     175TOOL_GXX32_LINK_LIBRARY_DEPORD =
    176176ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
    177 define TOOL_GCC32_LINK_LIBRARY_CMDS
     177define TOOL_GXX32_LINK_LIBRARY_CMDS
    178178        $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
    179179        $(QUIET)$(APPEND) -n $(out).ar-script \
    … …  
    182182        $(QUIET)$(APPEND) $(out).ar-script 'SAVE'
    183183        $(QUIET)$(APPEND) $(out).ar-script 'END'
    184         $(QUIET)$(TOOL_GCC32_AR) -M < $(out).ar-script
    185 endef
    186 else
    187 define TOOL_GCC32_LINK_LIBRARY_CMDS
     184        $(QUIET)$(TOOL_GXX32_AR) -M < $(out).ar-script
     185endef
     186else
     187define TOOL_GXX32_LINK_LIBRARY_CMDS
    188188        $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
    189189        $(foreach o, $(objs)\
    … …  
    193193        $(QUIET)$(APPEND) $(out).ar-script "SAVE"
    194194        $(QUIET)$(APPEND) $(out).ar-script "END"
    195         $(QUIET)$(TOOL_GCC32_AR) -M < $(out).ar-script
     195        $(QUIET)$(TOOL_GXX32_AR) -M < $(out).ar-script
    196196endef
    197197endif
    … …  
    211211# @param    $(custom_post)  Custom step invoked after linking.
    212212# @param    $(outbase)  Output basename (full). Use this for list files and such.
    213 TOOL_GCC32_LINK_PROGRAM_OUTPUT = $(outbase).map
    214 TOOL_GCC32_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    215 TOOL_GCC32_LINK_PROGRAM_DEPORD =
    216 define TOOL_GCC32_LINK_PROGRAM_CMDS
    217         $(QUIET)$(TOOL_GCC32_LD) $(flags) -o $(out) $(objs)\
     213TOOL_GXX32_LINK_PROGRAM_OUTPUT = $(outbase).map
     214TOOL_GXX32_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     215TOOL_GXX32_LINK_PROGRAM_DEPORD =
     216define TOOL_GXX32_LINK_PROGRAM_CMDS
     217        $(QUIET)$(TOOL_GXX32_LD) $(flags) -o $(out) $(objs)\
    218218                $(foreach p,$(libpath), -L$(p))\
    219219                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    220                 $(call TOOL_GCC32_LD_MAP,$(outbase).map)
     220                $(call TOOL_GXX32_LD_MAP,$(outbase).map)
    221221endef
    222222
    … …  
    235235# @param    $(custom_post)  Custom step invoked after linking.
    236236# @param    $(outbase)  Output basename (full). Use this for list files and such.
    237 TOOL_GCC32_LINK_DLL_OUTPUT = $(outbase).map
    238 TOOL_GCC32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    239 TOOL_GCC32_LINK_DLL_DEPORD =
    240 define TOOL_GCC32_LINK_DLL_CMDS
    241         $(QUIET)$(TOOL_GCC32_LD) $(TOOL_GCC32_LDFLAGS.dll) $(flags) -o $(out)\
    242                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC32_LD_SONAME,$(target),$(out)))\
     237TOOL_GXX32_LINK_DLL_OUTPUT = $(outbase).map
     238TOOL_GXX32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     239TOOL_GXX32_LINK_DLL_DEPORD =
     240define TOOL_GXX32_LINK_DLL_CMDS
     241        $(QUIET)$(TOOL_GXX32_LD) $(TOOL_GXX32_LDFLAGS.dll) $(flags) -o $(out)\
     242                $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GXX32_LD_SONAME,$(target),$(out)))\
    243243                $(objs)\
    244244                $(foreach p,$(libpath), -L$(p))\
    245245                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    246                 $(call TOOL_GCC32_LD_MAP,$(outbase).map)
     246                $(call TOOL_GXX32_LD_MAP,$(outbase).map)
    247247endef
    248248
    … …  
    261261# @param    $(custom_post)  Custom step invoked after linking.
    262262# @param    $(outbase)  Output basename (full). Use this for list files and such.
    263 TOOL_GCC32_LINK_SYSMOD_OUTPUT = $(outbase).map
    264 TOOL_GCC32_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    265 TOOL_GCC32_LINK_SYSMOD_DEPORD =
    266 define TOOL_GCC32_LINK_SYSMOD_CMDS
    267         $(QUIET)$(TOOL_GCC32_LD_SYSMOD) $(TOOL_GCC32_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
     263TOOL_GXX32_LINK_SYSMOD_OUTPUT = $(outbase).map
     264TOOL_GXX32_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     265TOOL_GXX32_LINK_SYSMOD_DEPORD =
     266define TOOL_GXX32_LINK_SYSMOD_CMDS
     267        $(QUIET)$(TOOL_GXX32_LD_SYSMOD) $(TOOL_GXX32_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
    268268                $(foreach p,$(libpath), -L$(p))\
    269269                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    270                 $(call TOOL_GCC32_LD_SYSMOD_MAP,$(outbase).map)
    271 endef
    272 
     270                $(call TOOL_GXX32_LD_SYSMOD_MAP,$(outbase).map)
     271endef
     272

  • trunk/kBuild/tools/GXX3OMF.kmk

    r965 r971  
    22## @file
    33#
    4 # kBuild Tool Config - GCC v3 targeting OS/2 OMF.
     4# kBuild Tool Config - GCC v3 targeting OS/2 OMF, for building C++ code.
    55#
    66# Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC3OMF := GCC v3 targeting OS/2 OMF.
     27TOOL_GXX3OMF := GCC v3 targeting OS/2 OMF, for building C++ code.
    2828
    2929# Tool Specific Properties
    30 TOOL_GCC3OMF_CC  ?= gcc$(HOSTSUFF_EXE)
    31 TOOL_GCC3OMF_CXX ?= g++$(HOSTSUFF_EXE)
    32 TOOL_GCC3OMF_AS  ?= gcc$(HOSTSUFF_EXE)
    33 TOOL_GCC3OMF_AR  ?= emxomfar$(HOSTSUFF_EXE)
    34 TOOL_GCC3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE)
    35 TOOL_GCC3OMF_LD ?= g++$(HOSTSUFF_EXE)
    36 TOOL_GCC3OMF_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
    37 ifndef TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET)
    38 TOOL_GCC3OMF_LDFLAGS.dll ?= -shared -Zdll
     30TOOL_GXX3OMF_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GXX3OMF_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GXX3OMF_AS  ?= gcc$(HOSTSUFF_EXE)
     33TOOL_GXX3OMF_AR  ?= emxomfar$(HOSTSUFF_EXE)
     34TOOL_GXX3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE)
     35TOOL_GXX3OMF_LD ?= g++$(HOSTSUFF_EXE)
     36TOOL_GXX3OMF_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
     37ifndef TOOL_GXX3OMF_LDFLAGS.$(BUILD_TARGET)
     38TOOL_GXX3OMF_LDFLAGS.dll ?= -shared -Zdll
    3939else
    40 TOOL_GCC3OMF_LDFLAGS.dll ?= $(TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET))
     40TOOL_GXX3OMF_LDFLAGS.dll ?= $(TOOL_GXX3OMF_LDFLAGS.$(BUILD_TARGET))
    4141endif
    42 TOOL_GCC3OMF_LDFLAGS.sysmod ?= -nostdlib
    43 TOOL_GCC3OMF_LD_MAP ?= -Zmap=$(1)
    44 TOOL_GCC3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
     42TOOL_GXX3OMF_LDFLAGS.sysmod ?= -nostdlib
     43TOOL_GXX3OMF_LD_MAP ?= -Zmap=$(1)
     44TOOL_GXX3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
    4545
    4646ifdef SLKRUNS
    47 TOOL_GCC3OMF_CC  += -fmessage-length=0
    48 TOOL_GCC3OMF_CXX += -fmessage-length=0
     47TOOL_GXX3OMF_CC  += -fmessage-length=0
     48TOOL_GXX3OMF_CXX += -fmessage-length=0
    4949endif
    5050
    5151# General Properties used by kBuild
    52 TOOL_GCC3OMF_COBJSUFF         ?= .o
    53 TOOL_GCC3OMF_CFLAGS           ?= -Zomf
    54 TOOL_GCC3OMF_CFLAGS.debug     ?= -g
    55 TOOL_GCC3OMF_CFLAGS.profile   ?= -g -O2 #-pg
    56 TOOL_GCC3OMF_CFLAGS.release   ?= -O2
    57 TOOL_GCC3OMF_CINCS            ?=
    58 TOOL_GCC3OMF_CDEFS            ?=
    59 
    60 TOOL_GCC3OMF_CXXOBJSUFF       ?= .o
    61 TOOL_GCC3OMF_CXXOBJSUFF       ?= .o
    62 TOOL_GCC3OMF_CXXFLAGS         ?= -Zomf
    63 TOOL_GCC3OMF_CXXFLAGS.debug   ?= -g
    64 TOOL_GCC3OMF_CXXFLAGS.profile ?= -g -O2 #-pg
    65 TOOL_GCC3OMF_CXXFLAGS.release ?= -O2
    66 TOOL_GCC3OMF_CXXINCS          ?=
    67 TOOL_GCC3OMF_CXXDEFS          ?=
    68 
    69 TOOL_GCC3OMF_ASFLAGS          ?= -x assembler-with-cpp
    70 TOOL_GCC3OMF_ASFLAGS.debug    ?= -g
    71 TOOL_GCC3OMF_ASFLAGS.profile  ?= -g
    72 TOOL_GCC3OMF_ASOBJSUFF        ?= .obj
    73 
    74 TOOL_GCC3OMF_ARFLAGS          ?= cr
    75 TOOL_GCC3OMF_ARLIBSUFF        ?= .lib
    76 
    77 TOOL_GCC3OMF_LDFLAGS          ?= -Zomf
    78 TOOL_GCC3OMF_LDFLAGS.debug    ?= -g
    79 TOOL_GCC3OMF_LDFLAGS.profile  ?= -g
     52TOOL_GXX3OMF_COBJSUFF         ?= .o
     53TOOL_GXX3OMF_CFLAGS           ?= -Zomf
     54TOOL_GXX3OMF_CFLAGS.debug     ?= -g
     55TOOL_GXX3OMF_CFLAGS.profile   ?= -g -O2 #-pg
     56TOOL_GXX3OMF_CFLAGS.release   ?= -O2
     57TOOL_GXX3OMF_CINCS            ?=
     58TOOL_GXX3OMF_CDEFS            ?=
     59
     60TOOL_GXX3OMF_CXXOBJSUFF       ?= .o
     61TOOL_GXX3OMF_CXXOBJSUFF       ?= .o
     62TOOL_GXX3OMF_CXXFLAGS         ?= -Zomf
     63TOOL_GXX3OMF_CXXFLAGS.debug   ?= -g
     64TOOL_GXX3OMF_CXXFLAGS.profile ?= -g -O2 #-pg
     65TOOL_GXX3OMF_CXXFLAGS.release ?= -O2
     66TOOL_GXX3OMF_CXXINCS          ?=
     67TOOL_GXX3OMF_CXXDEFS          ?=
     68
     69TOOL_GXX3OMF_ASFLAGS          ?= -x assembler-with-cpp
     70TOOL_GXX3OMF_ASFLAGS.debug    ?= -g
     71TOOL_GXX3OMF_ASFLAGS.profile  ?= -g
     72TOOL_GXX3OMF_ASOBJSUFF        ?= .obj
     73
     74TOOL_GXX3OMF_ARFLAGS          ?= cr
     75TOOL_GXX3OMF_ARLIBSUFF        ?= .lib
     76
     77TOOL_GXX3OMF_LDFLAGS          ?= -Zomf
     78TOOL_GXX3OMF_LDFLAGS.debug    ?= -g
     79TOOL_GXX3OMF_LDFLAGS.profile  ?= -g
    8080
    8181
    … …  
    9393# @param    $(outbase)  Output basename (full). Use this for list files and such.
    9494# @param    $(objsuff)  Object suffix.
    95 TOOL_GCC3OMF_COMPILE_C_OUTPUT =
    96 TOOL_GCC3OMF_COMPILE_C_DEPEND =
    97 TOOL_GCC3OMF_COMPILE_C_DEPORD =
    98 define TOOL_GCC3OMF_COMPILE_C_CMDS
    99         $(QUIET)$(TOOL_GCC3OMF_CC) -c\
     95TOOL_GXX3OMF_COMPILE_C_OUTPUT =
     96TOOL_GXX3OMF_COMPILE_C_DEPEND =
     97TOOL_GXX3OMF_COMPILE_C_DEPORD =
     98define TOOL_GXX3OMF_COMPILE_C_CMDS
     99        $(QUIET)$(TOOL_GXX3OMF_CC) -c\
    100100                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    101101                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
    … …  
    118118# @param    $(outbase)  Output basename (full). Use this for list files and such.
    119119# @param    $(objsuff)  Object suffix.
    120 TOOL_GCC3OMF_COMPILE_CXX_OUTPUT =
    121 TOOL_GCC3OMF_COMPILE_CXX_DEPEND =
    122 TOOL_GCC3OMF_COMPILE_CXX_DEPORD =
    123 define TOOL_GCC3OMF_COMPILE_CXX_CMDS
    124         $(QUIET)$(TOOL_GCC3OMF_CXX) -c\
     120TOOL_GXX3OMF_COMPILE_CXX_OUTPUT =
     121TOOL_GXX3OMF_COMPILE_CXX_DEPEND =
     122TOOL_GXX3OMF_COMPILE_CXX_DEPORD =
     123define TOOL_GXX3OMF_COMPILE_CXX_CMDS
     124        $(QUIET)$(TOOL_GXX3OMF_CXX) -c\
    125125                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    126126                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP \
    … …  
    143143# @param    $(objsuff)  Object suffix.
    144144#
    145 TOOL_GCC3OMF_COMPILE_AS_OUTPUT =
    146 TOOL_GCC3OMF_COMPILE_AS_DEPEND =
    147 TOOL_GCC3OMF_COMPILE_AS_DEPORD =
    148 define TOOL_GCC3OMF_COMPILE_AS_CMDS
    149         $(QUIET)$(TOOL_GCC3OMF_AS) -c\
     145TOOL_GXX3OMF_COMPILE_AS_OUTPUT =
     146TOOL_GXX3OMF_COMPILE_AS_DEPEND =
     147TOOL_GXX3OMF_COMPILE_AS_DEPORD =
     148define TOOL_GXX3OMF_COMPILE_AS_CMDS
     149        $(QUIET)$(TOOL_GXX3OMF_AS) -c\
    150150                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    151151                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    165165#
    166166# @param    $(outbase)  Output basename (full). Use this for list files and such.
    167 TOOL_GCC3OMF_LINK_LIBRARY_OUTPUT = $(outbase).rsp
    168 TOOL_GCC3OMF_LINK_LIBRARY_DEPEND = $(othersrc)
    169 TOOL_GCC3OMF_LINK_LIBRARY_DEPORD =
    170 define TOOL_GCC3OMF_LINK_LIBRARY_CMDS
     167TOOL_GXX3OMF_LINK_LIBRARY_OUTPUT = $(outbase).rsp
     168TOOL_GXX3OMF_LINK_LIBRARY_DEPEND = $(othersrc)
     169TOOL_GXX3OMF_LINK_LIBRARY_DEPORD =
     170define TOOL_GXX3OMF_LINK_LIBRARY_CMDS
    171171        $(if $(filter %.def %.imp,$(othersrc))\
    172172                ,$(QUIET)$(APPEND) -n $(outbase).rsp $(filter %.def %.imp,$(othersrc))\
    173                  $(NL)$(TAB)$(QUIET)$(QUIET)$(TOOL_GCC3OMF_AR_IMP) -o $(out) @$(outbase).rsp\
     173                 $(NL)$(TAB)$(QUIET)$(QUIET)$(TOOL_GXX3OMF_AR_IMP) -o $(out) @$(outbase).rsp\
    174174                 $(NL)$(TAB)$(QUIET)$(RM) -f $(outbase).rsp)
    175175        $(QUIET)$(APPEND) -n $(outbase).rsp $(flags) $(out) $(objs) $(filter-out %.def %.imp,$(othersrc))
    176         $(TOOL_GCC3OMF_AR) @$(outbase).rsp
     176        $(TOOL_GXX3OMF_AR) @$(outbase).rsp
    177177endef
    178178
    … …  
    192192#
    193193# @param    $(outbase)  Output basename (full). Use this for list files and such.
    194 TOOL_GCC3OMF_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
    195 TOOL_GCC3OMF_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    196 TOOL_GCC3OMF_LINK_PROGRAM_DEPORD =
    197 define TOOL_GCC3OMF_LINK_PROGRAM_CMDS
     194TOOL_GXX3OMF_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
     195TOOL_GXX3OMF_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     196TOOL_GXX3OMF_LINK_PROGRAM_DEPORD =
     197define TOOL_GXX3OMF_LINK_PROGRAM_CMDS
    198198        $(QUIET)$(APPEND) -n $(outbase).rsp\
    199199                $(flags)\
    … …  
    204204                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    205205                -Zmap=$(outbase).map
    206         $(QUIET)$(TOOL_GCC3OMF_LD) @$(outbase).rsp
     206        $(QUIET)$(TOOL_GXX3OMF_LD) @$(outbase).rsp
    207207endef
    208208
    … …  
    222222#
    223223# @param    $(outbase)  Output basename (full). Use this for list files and such.
    224 TOOL_GCC3OMF_LINK_DLL_OUTPUT = $(outbase).map $(outbase).rsp
    225 TOOL_GCC3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    226 TOOL_GCC3OMF_LINK_DLL_DEPORD =
    227 define TOOL_GCC3OMF_LINK_DLL_CMDS
     224TOOL_GXX3OMF_LINK_DLL_OUTPUT = $(outbase).map $(outbase).rsp
     225TOOL_GXX3OMF_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     226TOOL_GXX3OMF_LINK_DLL_DEPORD =
     227define TOOL_GXX3OMF_LINK_DLL_CMDS
    228228        $(QUIET)$(APPEND) -n $(outbase).rsp\
    229                 $(TOOL_GCC3OMF_LDFLAGS.dll)\
     229                $(TOOL_GXX3OMF_LDFLAGS.dll)\
    230230                $(flags)\
    231231                -o $(out)\
    … …  
    235235                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    236236                -Zmap=$(outbase).map
    237         $(TOOL_GCC3OMF_LD) @$(outbase).rsp
     237        $(TOOL_GXX3OMF_LD) @$(outbase).rsp
    238238endef
    239239
    … …  
    253253#
    254254# @param    $(outbase)  Output basename (full). Use this for list files and such.
    255 TOOL_GCC3OMF_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
    256 TOOL_GCC3OMF_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
    257 TOOL_GCC3OMF_LINK_SYSMOD_DEPORD =
    258 define TOOL_GCC3OMF_LINK_SYSMOD_CMDS
     255TOOL_GXX3OMF_LINK_SYSMOD_OUTPUT = $(outbase).map $(outbase).rsp
     256TOOL_GXX3OMF_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib))) $(othersrc)
     257TOOL_GXX3OMF_LINK_SYSMOD_DEPORD =
     258define TOOL_GXX3OMF_LINK_SYSMOD_CMDS
    259259        $(QUIET)$(APPEND) -n $(outbase).rsp\
    260                 $(TOOL_GCC3OMF_LDFLAGS.sysmod)\
     260                $(TOOL_GXX3OMF_LDFLAGS.sysmod)\
    261261                $(flags)\
    262262                -o $(out)\
    … …  
    266266                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    267267                -Zmap=$(outbase).map
    268         $(QUIET)$(TOOL_GCC3OMF_LD_SYSMOD) @$(outbase).rsp
    269 endef
    270 
     268        $(QUIET)$(TOOL_GXX3OMF_LD_SYSMOD) @$(outbase).rsp
     269endef
     270

  • trunk/kBuild/tools/GXX3PLAIN.kmk

    r965 r971  
    22## @file
    33#
    4 # kBuild Tool Config - Generic GCC v3.2.x or later Using The System GCC, any Unix Linker and Unix Archiver.
     4# kBuild Tool Config - Generic GCC v3.2.x or later using the system GCC, any Unix linker and Unix archiver to build C++ code.
    55#
    66# Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC3PLAIN := Generic GCC v3.2.x or later Using The System GCC, any Unix Linker and Unix Archiver.
     27TOOL_GXX3PLAIN := Generic GCC v3.2.x or later using the system GCC, any Unix linker and Unix archiver to build C++ code.
    2828
    2929# Tool Specific Properties
    30 TOOL_GCC3PLAIN_CC  ?= gcc$(HOSTSUFF_EXE)
    31 TOOL_GCC3PLAIN_CXX ?= g++$(HOSTSUFF_EXE)
    32 TOOL_GCC3PLAIN_AS  ?= gcc$(HOSTSUFF_EXE)
    33 TOOL_GCC3PLAIN_AR  ?= ar$(HOSTSUFF_EXE)
    34 TOOL_GCC3PLAIN_RANLIB ?= ranlib$(HOSTSUFF_EXE)
    35 TOOL_GCC3PLAIN_LD  ?= g++$(HOSTSUFF_EXE)
    36 TOOL_GCC3PLAIN_LDFLAGS.dll.os2 ?= -Zdll
    37 TOOL_GCC3PLAIN_LDFLAGS.dll.darwin ?= -dynamiclib
    38 ifndef TOOL_GCC_LDFLAGS.$(BUILD_TARGET)
    39  TOOL_GCC3PLAIN_LDFLAGS.dll ?= -shared
     30TOOL_GXX3PLAIN_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GXX3PLAIN_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GXX3PLAIN_AS  ?= gcc$(HOSTSUFF_EXE)
     33TOOL_GXX3PLAIN_AR  ?= ar$(HOSTSUFF_EXE)
     34TOOL_GXX3PLAIN_RANLIB ?= ranlib$(HOSTSUFF_EXE)
     35TOOL_GXX3PLAIN_LD  ?= g++$(HOSTSUFF_EXE)
     36TOOL_GXX3PLAIN_LDFLAGS.dll.os2 ?= -Zdll
     37TOOL_GXX3PLAIN_LDFLAGS.dll.darwin ?= -dynamiclib
     38ifndef TOOL_GXX3PLAIN_LDFLAGS.$(BUILD_TARGET)
     39 TOOL_GXX3PLAIN_LDFLAGS.dll ?= -shared
    4040else
    41  TOOL_GCC3PLAIN_LDFLAGS.dll ?= $(TOOL_GCC_LDFLAGS.$(BUILD_TARGET))
     41 TOOL_GXX3PLAIN_LDFLAGS.dll ?= $(TOOL_GXX3PLAIN_LDFLAGS.$(BUILD_TARGET))
    4242endif
    43 TOOL_GCC3PLAIN_LD_SONAME.darwin ?= $(NO_SUCH_VARIABLE)
    44 TOOL_GCC3PLAIN_LD_SONAME.os2 ?= $(NO_SUCH_VARIABLE)
    45 TOOL_GCC3PLAIN_LD_SONAME.win ?= $(NO_SUCH_VARIABLE)
    46 ifndef TOOL_GCC3PLAIN_LD_SONAME.$(BUILD_TARGET)
    47  TOOL_GCC3PLAIN_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     43TOOL_GXX3PLAIN_LD_SONAME.darwin ?= $(NO_SUCH_VARIABLE)
     44TOOL_GXX3PLAIN_LD_SONAME.os2 ?= $(NO_SUCH_VARIABLE)
     45TOOL_GXX3PLAIN_LD_SONAME.win ?= $(NO_SUCH_VARIABLE)
     46ifndef TOOL_GXX3PLAIN_LD_SONAME.$(BUILD_TARGET)
     47 TOOL_GXX3PLAIN_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    4848else
    49  TOOL_GCC3PLAIN_LD_SONAME ?= $(TOOL_GCC3PLAIN_LD_SONAME.$(BUILD_TARGET))
     49 TOOL_GXX3PLAIN_LD_SONAME ?= $(TOOL_GXX3PLAIN_LD_SONAME.$(BUILD_TARGET))
    5050endif
    5151ifdef SLKRUNS
    52  TOOL_GCC3PLAIN_CC  += -fmessage-length=0
    53  TOOL_GCC3PLAIN_CXX += -fmessage-length=0
     52 TOOL_GXX3PLAIN_CC  += -fmessage-length=0
     53 TOOL_GXX3PLAIN_CXX += -fmessage-length=0
    5454endif
    5555
    5656# General Properties used by kBuild
    57 TOOL_GCC3PLAIN_COBJSUFF         ?= .o
    58 TOOL_GCC3PLAIN_CFLAGS           ?=
    59 TOOL_GCC3PLAIN_CFLAGS.debug     ?= -g
    60 TOOL_GCC3PLAIN_CFLAGS.profile   ?= -g -O2 #-pg
    61 TOOL_GCC3PLAIN_CFLAGS.release   ?= -O2
    62 TOOL_GCC3PLAIN_CINCS            ?=
    63 TOOL_GCC3PLAIN_CDEFS            ?=
    64 
    65 TOOL_GCC3PLAIN_CXXOBJSUFF       ?= .o
    66 TOOL_GCC3PLAIN_CXXOBJSUFF       ?= .o
    67 TOOL_GCC3PLAIN_CXXFLAGS         ?=
    68 TOOL_GCC3PLAIN_CXXFLAGS.debug   ?= -g
    69 TOOL_GCC3PLAIN_CXXFLAGS.profile ?= -g -O2 #-pg
    70 TOOL_GCC3PLAIN_CXXFLAGS.release ?= -O2
    71 TOOL_GCC3PLAIN_CXXINCS          ?=
    72 TOOL_GCC3PLAIN_CXXDEFS          ?=
    73 
    74 TOOL_GCC3PLAIN_ASFLAGS          ?= -x assembler-with-cpp
    75 TOOL_GCC3PLAIN_ASFLAGS.debug    ?= -g
    76 TOOL_GCC3PLAIN_ASFLAGS.profile  ?= -g
    77 TOOL_GCC3PLAIN_ASOBJSUFF        ?= .o
    78 
    79 TOOL_GCC3PLAIN_ARFLAGS          ?= cr
    80 TOOL_GCC3PLAIN_ARLIBSUFF        ?= .a
    81 
    82 TOOL_GCC3PLAIN_LDFLAGS          ?=
    83 TOOL_GCC3PLAIN_LDFLAGS.debug    ?= -g
    84 TOOL_GCC3PLAIN_LDFLAGS.profile  ?= -g
     57TOOL_GXX3PLAIN_COBJSUFF         ?= .o
     58TOOL_GXX3PLAIN_CFLAGS           ?=
     59TOOL_GXX3PLAIN_CFLAGS.debug     ?= -g
     60TOOL_GXX3PLAIN_CFLAGS.profile   ?= -g -O2 #-pg
     61TOOL_GXX3PLAIN_CFLAGS.release   ?= -O2
     62TOOL_GXX3PLAIN_CINCS            ?=
     63TOOL_GXX3PLAIN_CDEFS            ?=
     64
     65TOOL_GXX3PLAIN_CXXOBJSUFF       ?= .o
     66TOOL_GXX3PLAIN_CXXOBJSUFF       ?= .o
     67TOOL_GXX3PLAIN_CXXFLAGS         ?=
     68TOOL_GXX3PLAIN_CXXFLAGS.debug   ?= -g
     69TOOL_GXX3PLAIN_CXXFLAGS.profile ?= -g -O2 #-pg
     70TOOL_GXX3PLAIN_CXXFLAGS.release ?= -O2
     71TOOL_GXX3PLAIN_CXXINCS          ?=
     72TOOL_GXX3PLAIN_CXXDEFS          ?=
     73
     74TOOL_GXX3PLAIN_ASFLAGS          ?= -x assembler-with-cpp
     75TOOL_GXX3PLAIN_ASFLAGS.debug    ?= -g
     76TOOL_GXX3PLAIN_ASFLAGS.profile  ?= -g
     77TOOL_GXX3PLAIN_ASOBJSUFF        ?= .o
     78
     79TOOL_GXX3PLAIN_ARFLAGS          ?= cr
     80TOOL_GXX3PLAIN_ARLIBSUFF        ?= .a
     81
     82TOOL_GXX3PLAIN_LDFLAGS          ?=
     83TOOL_GXX3PLAIN_LDFLAGS.debug    ?= -g
     84TOOL_GXX3PLAIN_LDFLAGS.profile  ?= -g
    8585
    8686
    … …  
    9898# @param    $(outbase)  Output basename (full). Use this for list files and such.
    9999# @param    $(objsuff)  Object suffix.
    100 TOOL_GCC3PLAIN_COMPILE_C_OUTPUT =
    101 TOOL_GCC3PLAIN_COMPILE_C_DEPEND =
    102 TOOL_GCC3PLAIN_COMPILE_C_DEPORD =
    103 define TOOL_GCC3PLAIN_COMPILE_C_CMDS
    104         $(QUIET)$(TOOL_GCC3PLAIN_CC) -c\
     100TOOL_GXX3PLAIN_COMPILE_C_OUTPUT =
     101TOOL_GXX3PLAIN_COMPILE_C_DEPEND =
     102TOOL_GXX3PLAIN_COMPILE_C_DEPORD =
     103define TOOL_GXX3PLAIN_COMPILE_C_CMDS
     104        $(QUIET)$(TOOL_GXX3PLAIN_CC) -c\
    105105                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    106106                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    122122# @param    $(outbase)  Output basename (full). Use this for list files and such.
    123123# @param    $(objsuff)  Object suffix.
    124 TOOL_GCC3PLAIN_COMPILE_CXX_OUTPUT =
    125 TOOL_GCC3PLAIN_COMPILE_CXX_DEPEND =
    126 TOOL_GCC3PLAIN_COMPILE_CXX_DEPORD =
    127 define TOOL_GCC3PLAIN_COMPILE_CXX_CMDS
    128         $(QUIET)$(TOOL_GCC3PLAIN_CXX) -c\
     124TOOL_GXX3PLAIN_COMPILE_CXX_OUTPUT =
     125TOOL_GXX3PLAIN_COMPILE_CXX_DEPEND =
     126TOOL_GXX3PLAIN_COMPILE_CXX_DEPORD =
     127define TOOL_GXX3PLAIN_COMPILE_CXX_CMDS
     128        $(QUIET)$(TOOL_GXX3PLAIN_CXX) -c\
    129129                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    130130                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    147147# @param    $(objsuff)  Object suffix.
    148148#
    149 TOOL_GCC3PLAIN_COMPILE_AS_OUTPUT =
    150 TOOL_GCC3PLAIN_COMPILE_AS_DEPEND =
    151 TOOL_GCC3PLAIN_COMPILE_AS_DEPORD =
    152 define TOOL_GCC3PLAIN_COMPILE_AS_CMDS
    153         $(QUIET)$(TOOL_GCC3PLAIN_AS) -c\
     149TOOL_GXX3PLAIN_COMPILE_AS_OUTPUT =
     150TOOL_GXX3PLAIN_COMPILE_AS_DEPEND =
     151TOOL_GXX3PLAIN_COMPILE_AS_DEPORD =
     152define TOOL_GXX3PLAIN_COMPILE_AS_CMDS
     153        $(QUIET)$(TOOL_GXX3PLAIN_AS) -c\
    154154                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    155155                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    168168# @param    $(othersrc) Unhandled sources.
    169169# @param    $(outbase)  Output basename (full). Use this for list files and such.
    170 TOOL_GCC3PLAIN_LINK_LIBRARY_OUTPUT = $(out).ar-script
    171 TOOL_GCC3PLAIN_LINK_LIBRARY_DEPEND = $(othersrc)
    172 TOOL_GCC3PLAIN_LINK_LIBRARY_DEPORD =
    173 define TOOL_GCC3PLAIN_LINK_LIBRARY_CMDS
    174         $(call xargs,$(QUIET)$(TOOL_GCC3PLAIN_AR) $(flags) $(out),$(objs))
     170TOOL_GXX3PLAIN_LINK_LIBRARY_OUTPUT = $(out).ar-script
     171TOOL_GXX3PLAIN_LINK_LIBRARY_DEPEND = $(othersrc)
     172TOOL_GXX3PLAIN_LINK_LIBRARY_DEPORD =
     173define TOOL_GXX3PLAIN_LINK_LIBRARY_CMDS
     174        $(call xargs,$(QUIET)$(TOOL_GXX3PLAIN_AR) $(flags) $(out),$(objs))
    175175        $(foreach lib,$(othersrc)\
    176176                ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \
    … …  
    178178                $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \
    179179                $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \
    180                         && $(TOOL_GCC3PLAIN_AR) x $(abspath $(lib)) \
    181                         && $(TOOL_GCC3PLAIN_AR) $(flags) $(out) *) \
     180                        && $(TOOL_GXX3PLAIN_AR) x $(abspath $(lib)) \
     181                        && $(TOOL_GXX3PLAIN_AR) $(flags) $(out) *) \
    182182                $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \
    183183                $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/)
    184         $(QUIET)$(TOOL_GCC3PLAIN_RANLIB) $(out)
     184        $(QUIET)$(TOOL_GXX3PLAIN_RANLIB) $(out)
    185185endef
    186186
    … …  
    199199# @param    $(custom_post)  Custom step invoked after linking.
    200200# @param    $(outbase)  Output basename (full). Use this for list files and such.
    201 TOOL_GCC3PLAIN_LINK_PROGRAM_OUTPUT = $(outbase).map
    202 TOOL_GCC3PLAIN_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
     201TOOL_GXX3PLAIN_LINK_PROGRAM_OUTPUT = $(outbase).map
     202TOOL_GXX3PLAIN_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    203203                $(filter %.def, $(othersrc))
    204 TOOL_GCC3PLAIN_LINK_PROGRAM_DEPORD =
    205 define TOOL_GCC3PLAIN_LINK_PROGRAM_CMDS
    206         $(QUIET)$(TOOL_GCC3PLAIN_LD) $(flags) -o $(out) $(objs)\
     204TOOL_GXX3PLAIN_LINK_PROGRAM_DEPORD =
     205define TOOL_GXX3PLAIN_LINK_PROGRAM_CMDS
     206        $(QUIET)$(TOOL_GXX3PLAIN_LD) $(flags) -o $(out) $(objs)\
    207207                $(filter %.def, $(othersrc))\
    208208                $(foreach p,$(libpath), -L$(p))\
    … …  
    224224# @param    $(custom_post)  Custom step invoked after linking.
    225225# @param    $(outbase)  Output basename (full). Use this for list files and such.
    226 TOOL_GCC3PLAIN_LINK_DLL_OUTPUT = $(outbase).map
    227 TOOL_GCC3PLAIN_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
     226TOOL_GXX3PLAIN_LINK_DLL_OUTPUT = $(outbase).map
     227TOOL_GXX3PLAIN_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    228228                $(filter %.def, $(othersrc))
    229 TOOL_GCC3PLAIN_LINK_DLL_DEPORD =
    230 define TOOL_GCC3PLAIN_LINK_DLL_CMDS
    231         $(QUIET)$(TOOL_GCC3PLAIN_LD) $(TOOL_GCC3PLAIN_LDFLAGS.dll) $(flags) -o $(out)\
    232                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3PLAIN_LD_SONAME,$(target),$(out)))\
     229TOOL_GXX3PLAIN_LINK_DLL_DEPORD =
     230define TOOL_GXX3PLAIN_LINK_DLL_CMDS
     231        $(QUIET)$(TOOL_GXX3PLAIN_LD) $(TOOL_GXX3PLAIN_LDFLAGS.dll) $(flags) -o $(out)\
     232                $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GXX3PLAIN_LD_SONAME,$(target),$(out)))\
    233233                $(objs)\
    234234                $(filter %.def, $(othersrc))\

  • trunk/kBuild/tools/GXX4MACHO.kmk

    r965 r971  
    22## @file
    33#
    4 # kBuild Tool Config - GCC v4 targeting Darwin (Mac OS X) Mach-o.
     4# kBuild Tool Config - GCC v4 targeting Darwin (Mac OS X) Mach-o, for building C++ code.
    55#
    66# Copyright (c) 2004-2007 knut st. osmundsen <bird-kBuild-spam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_GCC4MACHO := GCC v4 targeting Darwin (Mac OS X) Mach-o.
     27TOOL_GXX4MACHO := GCC v4 targeting Darwin (Mac OS X) Mach-o, for building C++ code.
    2828
    2929# Tool Specific Properties
    30 TOOL_GCC4MACHO_CC  ?= gcc$(HOSTSUFF_EXE)
    31 TOOL_GCC4MACHO_CXX ?= g++$(HOSTSUFF_EXE)
    32 TOOL_GCC4MACHO_AS  ?= gcc$(HOSTSUFF_EXE)
    33 TOOL_GCC4MACHO_LD  ?= g++$(HOSTSUFF_EXE)
    34 TOOL_GCC4MACHO_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
    35 ifndef TOOL_GCC4MACHO_LDFLAGS.$(BUILD_TARGET)
    36 TOOL_GCC4MACHO_LDFLAGS.dll ?= -dynamiclib
     30TOOL_GXX4MACHO_CC  ?= gcc$(HOSTSUFF_EXE)
     31TOOL_GXX4MACHO_CXX ?= g++$(HOSTSUFF_EXE)
     32TOOL_GXX4MACHO_AS  ?= gcc$(HOSTSUFF_EXE)
     33TOOL_GXX4MACHO_LD  ?= g++$(HOSTSUFF_EXE)
     34TOOL_GXX4MACHO_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
     35ifndef TOOL_GXX4MACHO_LDFLAGS.$(BUILD_TARGET)
     36TOOL_GXX4MACHO_LDFLAGS.dll ?= -dynamiclib
    3737else
    38 TOOL_GCC4MACHO_LDFLAGS.dll ?= $(TOOL_GCC4MACHO_LDFLAGS.$(BUILD_TARGET))
     38TOOL_GXX4MACHO_LDFLAGS.dll ?= $(TOOL_GXX4MACHO_LDFLAGS.$(BUILD_TARGET))
    3939endif
    40 TOOL_GCC4MACHO_LDFLAGS.sysmod ?= -r
    41 #TOOL_GCC4MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     40TOOL_GXX4MACHO_LDFLAGS.sysmod ?= -r
     41#TOOL_GXX4MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    4242
    4343ifdef SLKRUNS
    44 TOOL_GCC4MACHO_CC  += -fmessage-length=0
    45 TOOL_GCC4MACHO_CXX += -fmessage-length=0
     44TOOL_GXX4MACHO_CC  += -fmessage-length=0
     45TOOL_GXX4MACHO_CXX += -fmessage-length=0
    4646endif
    4747
    4848# General Properties used by kBuild
    49 TOOL_GCC4MACHO_COBJSUFF         ?= .o
    50 TOOL_GCC4MACHO_CFLAGS           ?=
    51 TOOL_GCC4MACHO_CFLAGS.debug     ?= -g
    52 TOOL_GCC4MACHO_CFLAGS.profile   ?= -g -O2 #-pg
    53 TOOL_GCC4MACHO_CFLAGS.release   ?= -O2
    54 TOOL_GCC4MACHO_CINCS            ?=
    55 TOOL_GCC4MACHO_CDEFS            ?=
    56 
    57 TOOL_GCC4MACHO_CXXOBJSUFF       ?= .o
    58 TOOL_GCC4MACHO_CXXOBJSUFF       ?= .o
    59 TOOL_GCC4MACHO_CXXFLAGS         ?=
    60 TOOL_GCC4MACHO_CXXFLAGS.debug   ?= -g
    61 TOOL_GCC4MACHO_CXXFLAGS.profile ?= -g -O2 #-pg
    62 TOOL_GCC4MACHO_CXXFLAGS.release ?= -O2
    63 TOOL_GCC4MACHO_CXXINCS          ?=
    64 TOOL_GCC4MACHO_CXXDEFS          ?=
    65 
    66 TOOL_GCC4MACHO_ASFLAGS          ?= -x assembler-with-cpp
    67 TOOL_GCC4MACHO_ASFLAGS.debug    ?= -g
    68 TOOL_GCC4MACHO_ASFLAGS.profile  ?= -g
    69 TOOL_GCC4MACHO_ASOBJSUFF        ?= .o
    70 
    71 TOOL_GCC4MACHO_AR               ?= ar$(HOSTSUFF_EXE)
    72 TOOL_GCC4MACHO_ARFLAGS          ?= -c -rs
    73 TOOL_GCC4MACHO_ARLIBSUFF        ?= .a
    74 
    75 TOOL_GCC4MACHO_LDFLAGS          ?=
    76 TOOL_GCC4MACHO_LDFLAGS.debug    ?= -g
    77 TOOL_GCC4MACHO_LDFLAGS.profile  ?= -g
     49TOOL_GXX4MACHO_COBJSUFF         ?= .o
     50TOOL_GXX4MACHO_CFLAGS           ?=
     51TOOL_GXX4MACHO_CFLAGS.debug     ?= -g
     52TOOL_GXX4MACHO_CFLAGS.profile   ?= -g -O2 #-pg
     53TOOL_GXX4MACHO_CFLAGS.release   ?= -O2
     54TOOL_GXX4MACHO_CINCS            ?=
     55TOOL_GXX4MACHO_CDEFS            ?=
     56
     57TOOL_GXX4MACHO_CXXOBJSUFF       ?= .o
     58TOOL_GXX4MACHO_CXXOBJSUFF       ?= .o
     59TOOL_GXX4MACHO_CXXFLAGS         ?=
     60TOOL_GXX4MACHO_CXXFLAGS.debug   ?= -g
     61TOOL_GXX4MACHO_CXXFLAGS.profile ?= -g -O2 #-pg
     62TOOL_GXX4MACHO_CXXFLAGS.release ?= -O2
     63TOOL_GXX4MACHO_CXXINCS          ?=
     64TOOL_GXX4MACHO_CXXDEFS          ?=
     65
     66TOOL_GXX4MACHO_ASFLAGS          ?= -x assembler-with-cpp
     67TOOL_GXX4MACHO_ASFLAGS.debug    ?= -g
     68TOOL_GXX4MACHO_ASFLAGS.profile  ?= -g
     69TOOL_GXX4MACHO_ASOBJSUFF        ?= .o
     70
     71TOOL_GXX4MACHO_AR               ?= ar$(HOSTSUFF_EXE)
     72TOOL_GXX4MACHO_ARFLAGS          ?= -c -rs
     73TOOL_GXX4MACHO_ARLIBSUFF        ?= .a
     74
     75TOOL_GXX4MACHO_LDFLAGS          ?=
     76TOOL_GXX4MACHO_LDFLAGS.debug    ?= -g
     77TOOL_GXX4MACHO_LDFLAGS.profile  ?= -g
    7878
    7979
    … …  
    9191# @param    $(outbase)  Output basename (full). Use this for list files and such.
    9292# @param    $(objsuff)  Object suffix.
    93 TOOL_GCC4MACHO_COMPILE_C_OUTPUT =
    94 TOOL_GCC4MACHO_COMPILE_C_DEPEND =
    95 TOOL_GCC4MACHO_COMPILE_C_DEPORD =
    96 define TOOL_GCC4MACHO_COMPILE_C_CMDS
    97         $(QUIET)$(TOOL_GCC4MACHO_CC) -c\
     93TOOL_GXX4MACHO_COMPILE_C_OUTPUT =
     94TOOL_GXX4MACHO_COMPILE_C_DEPEND =
     95TOOL_GXX4MACHO_COMPILE_C_DEPORD =
     96define TOOL_GXX4MACHO_COMPILE_C_CMDS
     97        $(QUIET)$(TOOL_GXX4MACHO_CC) -c\
    9898                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    9999                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    115115# @param    $(outbase)  Output basename (full). Use this for list files and such.
    116116# @param    $(objsuff)  Object suffix.
    117 TOOL_GCC4MACHO_COMPILE_CXX_OUTPUT =
    118 TOOL_GCC4MACHO_COMPILE_CXX_DEPEND =
    119 TOOL_GCC4MACHO_COMPILE_CXX_DEPORD =
    120 define TOOL_GCC4MACHO_COMPILE_CXX_CMDS
    121         $(QUIET)$(TOOL_GCC4MACHO_CXX) -c\
     117TOOL_GXX4MACHO_COMPILE_CXX_OUTPUT =
     118TOOL_GXX4MACHO_COMPILE_CXX_DEPEND =
     119TOOL_GXX4MACHO_COMPILE_CXX_DEPORD =
     120define TOOL_GXX4MACHO_COMPILE_CXX_CMDS
     121        $(QUIET)$(TOOL_GXX4MACHO_CXX) -c\
    122122                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    123123                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    140140# @param    $(objsuff)  Object suffix.
    141141#
    142 TOOL_GCC4MACHO_COMPILE_AS_OUTPUT =
    143 TOOL_GCC4MACHO_COMPILE_AS_DEPEND =
    144 TOOL_GCC4MACHO_COMPILE_AS_DEPORD =
    145 define TOOL_GCC4MACHO_COMPILE_AS_CMDS
    146         $(QUIET)$(TOOL_GCC4MACHO_AS) -c\
     142TOOL_GXX4MACHO_COMPILE_AS_OUTPUT =
     143TOOL_GXX4MACHO_COMPILE_AS_DEPEND =
     144TOOL_GXX4MACHO_COMPILE_AS_DEPORD =
     145define TOOL_GXX4MACHO_COMPILE_AS_CMDS
     146        $(QUIET)$(TOOL_GXX4MACHO_AS) -c\
    147147                $(flags) $(addprefix -I, $(incs)) $(addprefix -D, $(defs))\
    148148                -Wp,-MD,$(dep) -Wp,-MT,$(obj) -Wp,-MP\
    … …  
    161161# @param    $(othersrc) Unhandled sources.
    162162# @param    $(outbase)  Output basename (full). Use this for list files and such.
    163 TOOL_GCC4MACHO_LINK_LIBRARY_OUTPUT =
    164 TOOL_GCC4MACHO_LINK_LIBRARY_DEPEND = $(othersrc)
    165 TOOL_GCC4MACHO_LINK_LIBRARY_DEPORD =
    166 define TOOL_GCC4MACHO_LINK_LIBRARY_CMDS
    167         $(call xargs,$(QUIET)$(TOOL_GCC4MACHO_AR) $(flags) $(out),$(objs))
     163TOOL_GXX4MACHO_LINK_LIBRARY_OUTPUT =
     164TOOL_GXX4MACHO_LINK_LIBRARY_DEPEND = $(othersrc)
     165TOOL_GXX4MACHO_LINK_LIBRARY_DEPORD =
     166define TOOL_GXX4MACHO_LINK_LIBRARY_CMDS
     167        $(call xargs,$(QUIET)$(TOOL_GXX4MACHO_AR) $(flags) $(out),$(objs))
    168168        $(foreach lib,$(othersrc)\
    169169                ,$(NL)$(TAB)$(call MSG_AR_MERGE,$(target),$(out),$(lib)) \
    … …  
    171171                $(NL)$(TAB)$(QUIET)$(MKDIR) -p $(dir $(outbase))/ar.tmp.dir/ \
    172172                $(NL)$(TAB)$(QUIET)(cd $(dir $(outbase))ar.tmp.dir/ \
    173                         && $(TOOL_GCC4MACHO_AR) -x $(abspath $(lib)) \
     173                        && $(TOOL_GXX4MACHO_AR) -x $(abspath $(lib)) \
    174174                    && $(RM_EXT) -f ./__.SYMDEF* \
    175                         && $(TOOL_GCC4MACHO_AR) $(flags) $(out) *) \
     175                        && $(TOOL_GXX4MACHO_AR) $(flags) $(out) *) \
    176176                $(NL)$(TAB)$(QUIET)$(RM_EXT) -f $(dir $(outbase))/ar.tmp.dir/* \
    177177                $(NL)$(TAB)$(QUIET)$(RMDIR) $(dir $(outbase))ar.tmp.dir/)
    … …  
    192192# @param    $(custom_post)  Custom step invoked after linking.
    193193# @param    $(outbase)  Output basename (full). Use this for list files and such.
    194 TOOL_GCC4MACHO_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
    195 TOOL_GCC4MACHO_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    196 TOOL_GCC4MACHO_LINK_PROGRAM_DEPORD =
    197 define TOOL_GCC4MACHO_LINK_PROGRAM_CMDS
     194TOOL_GXX4MACHO_LINK_PROGRAM_OUTPUT = $(outbase).map $(outbase).rsp
     195TOOL_GXX4MACHO_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     196TOOL_GXX4MACHO_LINK_PROGRAM_DEPORD =
     197define TOOL_GXX4MACHO_LINK_PROGRAM_CMDS
    198198        $(QUIET)$(APPEND) -n $(outbase).rsp $(objs)
    199         $(QUIET)$(TOOL_GCC4MACHO_LD) $(flags) -o $(out)\
     199        $(QUIET)$(TOOL_GXX4MACHO_LD) $(flags) -o $(out)\
    200200                -filelist $(outbase).rsp\
    201201                $(foreach p,$(libpath), -L$(p))\
    … …  
    217217# @param    $(custom_post)  Custom step invoked after linking.
    218218# @param    $(outbase)  Output basename (full). Use this for list files and such.
    219 TOOL_GCC4MACHO_LINK_DLL_OUTPUT = $(outbase).rsp
    220 TOOL_GCC4MACHO_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    221 TOOL_GCC4MACHO_LINK_DLL_DEPORD =
    222 define TOOL_GCC4MACHO_LINK_DLL_CMDS
     219TOOL_GXX4MACHO_LINK_DLL_OUTPUT = $(outbase).rsp
     220TOOL_GXX4MACHO_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     221TOOL_GXX4MACHO_LINK_DLL_DEPORD =
     222define TOOL_GXX4MACHO_LINK_DLL_CMDS
    223223        $(QUIET)$(APPEND) -n $(outbase).rsp $(objs)
    224         $(QUIET)$(TOOL_GCC4MACHO_LD) $(TOOL_GCC4MACHO_LDFLAGS.dll) $(flags) -o $(out)\
    225                 $(call TOOL_GCC4MACHO_LD_SONAME,$(target),$(out))\
     224        $(QUIET)$(TOOL_GXX4MACHO_LD) $(TOOL_GXX4MACHO_LDFLAGS.dll) $(flags) -o $(out)\
     225                $(call TOOL_GXX4MACHO_LD_SONAME,$(target),$(out))\
    226226                -filelist $(outbase).rsp\
    227227                $(foreach p,$(libpath), -L$(p))\
    … …  
    243243# @param    $(custom_post)  Custom step invoked after linking.
    244244# @param    $(outbase)  Output basename (full). Use this for list files and such.
    245 TOOL_GCC4MACHO_LINK_SYSMOD_OUTPUT = $(outbase).rsp
    246 TOOL_GCC4MACHO_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
    247 TOOL_GCC4MACHO_LINK_SYSMOD_DEPORD =
    248 define TOOL_GCC4MACHO_LINK_SYSMOD_CMDS
     245TOOL_GXX4MACHO_LINK_SYSMOD_OUTPUT = $(outbase).rsp
     246TOOL_GXX4MACHO_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))
     247TOOL_GXX4MACHO_LINK_SYSMOD_DEPORD =
     248define TOOL_GXX4MACHO_LINK_SYSMOD_CMDS
    249249        $(QUIET)$(APPEND) -n $(outbase).rsp $(objs)
    250         $(QUIET)$(TOOL_GCC4MACHO_LD_SYSMOD) $(TOOL_GCC4MACHO_LDFLAGS.sysmod) $(flags) -o $(out)\
     250        $(QUIET)$(TOOL_GXX4MACHO_LD_SYSMOD) $(TOOL_GXX4MACHO_LDFLAGS.sysmod) $(flags) -o $(out)\
    251251                -filelist $(outbase).rsp\
    252252                $(foreach p,$(libpath), -L$(p))\
Note: See TracChangeset for help on using the changeset viewer.