VirtualBox

Changeset 3393 in kBuild


Ignore:
Timestamp:
Jun 30, 2020 5:11:42 PM (5 years ago)
Author:
bird
Message:

tools/*GCC|GXX*: More prefix/suffix stuff. Separate for gcc/g++, binutils and other stuff.

Location:
trunk/kBuild/tools
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/kBuild/tools/GCC.kmk

    r3121 r3393  
    3535
    3636# Tool Specific Properties
    37 TOOL_GCC_CC  ?= gcc$(HOSTSUFF_EXE)
    38 TOOL_GCC_CXX ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GCC_AS  ?= gcc$(HOSTSUFF_EXE)
    40 TOOL_GCC_AR  ?= ar$(HOSTSUFF_EXE)
    41 TOOL_GCC_RANLIB ?= ranlib$(HOSTSUFF_EXE)
    42 TOOL_GCC_LD  ?= gcc$(HOSTSUFF_EXE)
    43 TOOL_GCC_LDFLAGS.dll.os2 ?= -Zdll
     37ifndef TOOL_GCC_PREFIX
     38 TOOL_GCC_PREFIX :=
     39endif
     40ifndef TOOL_GCC_SUFFIX
     41 TOOL_GCC_SUFFIX := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GCC_PREFIX2 ?= $(TOOL_GCC_PREFIX)
     44TOOL_GCC_SUFFIX2 ?= $(TOOL_GCC_SUFFIX)
     45TOOL_GCC_CC      ?= $(TOOL_GCC_PREFIX)gcc$(TOOL_GCC_SUFFIX)
     46TOOL_GCC_CXX     ?= $(TOOL_GCC_PREFIX)g++$(TOOL_GCC_SUFFIX)
     47TOOL_GCC_AS      ?= $(TOOL_GCC_PREFIX)gcc$(TOOL_GCC_SUFFIX)
     48TOOL_GCC_AR      ?= $(TOOL_GCC_PREFIX2)ar$(TOOL_GCC_SUFFIX2)
     49TOOL_GCC_RANLIB  ?= $(TOOL_GCC_PREFIX2)ranlib$(TOOL_GCC_SUFFIX2)
     50TOOL_GCC_LD      ?= $(TOOL_GCC_PREFIX)gcc$(TOOL_GCC_SUFFIX)
     51TOOL_GCC_LDFLAGS.dll.os2    ?= -Zdll
    4452TOOL_GCC_LDFLAGS.dll.darwin ?= -dynamiclib
    4553ifndef TOOL_GCC_LDFLAGS.$(KBUILD_TARGET)
    46 TOOL_GCC_LDFLAGS.dll ?= -shared
     54 TOOL_GCC_LDFLAGS.dll      ?= -shared
    4755else
    48 TOOL_GCC_LDFLAGS.dll ?= $(TOOL_GCC_LDFLAGS.$(KBUILD_TARGET))
     56 TOOL_GCC_LDFLAGS.dll      ?= $(TOOL_GCC_LDFLAGS.$(KBUILD_TARGET))
    4957endif
    5058
  • trunk/kBuild/tools/GCC3.kmk

    r3121 r3393  
    3535
    3636# Tool Specific Properties
    37 TOOL_GCC3_CC  ?= gcc$(HOSTSUFF_EXE)
    38 TOOL_GCC3_CXX ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GCC3_AS  ?= gcc$(HOSTSUFF_EXE)
    40 ifeq ($(KBUILD_TARGET),solaris) ## @todo drop the MRI script!
    41  TOOL_GCC3_AR ?= gar$(HOSTSUFF_EXE)
    42 else
    43  TOOL_GCC3_AR ?= ar$(HOSTSUFF_EXE)
    44 endif
     37ifndef TOOL_GCC3_PREFIX
     38 TOOL_GCC3_PREFIX :=
     39endif
     40ifndef TOOL_GCC3_SUFFIX
     41 TOOL_GCC3_SUFFIX := $(HOSTSUFF_EXE)
     42endif
     43if1of ($(KBUILD_HOST), solaris)
     44 TOOL_GCC3_PREFIX2  ?= g
     45else
     46 TOOL_GCC3_PREFIX2  ?=
     47endif
     48TOOL_GCC3_SUFFIX2   ?= $(HOSTSUFF_EXE)
     49TOOL_GCC3_PREFIX3   ?=
     50TOOL_GCC3_SUFFIX3   ?= $(HOSTSUFF_EXE)
     51TOOL_GCC3_CC        ?= $(TOOL_GCC3_PREFIX)gcc$(TOOL_GCC3_SUFFIX)
     52TOOL_GCC3_CXX       ?= $(TOOL_GCC3_PREFIX)g++$(TOOL_GCC3_SUFFIX)
     53TOOL_GCC3_AS        ?= $(TOOL_GCC3_PREFIX)gcc$(TOOL_GCC3_SUFFIX)
     54TOOL_GCC3_AR        ?= $(TOOL_GCC3_PREFIX2)ar$(TOOL_GCC3_SUFFIX2)
    4555ifeq ($(KBUILD_TARGET),os2)
    46  TOOL_GCC3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
    47 else
    48  TOOL_GCC3_AR_IMP ?= $(ECHO) not supported!
    49 endif
    50 TOOL_GCC3_LD ?= gcc$(HOSTSUFF_EXE)
    51 TOOL_GCC3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
     56 TOOL_GCC3_AR_IMP   ?= $(TOOL_GCC3_PREFIX3)emximp$(TOOL_GCC3_SUFFIX3)
     57else
     58 TOOL_GCC3_AR_IMP   ?= $(ECHO) not supported!
     59endif
     60TOOL_GCC3_LD        ?= $(TOOL_GCC3_PREFIX)gcc$(TOOL_GCC3_SUFFIX)
     61if1of ($(KBUILD_HOST), solaris)
     62TOOL_GCC3_LD_SYSMOD ?= $(TOOL_GCC3_PREFIX3)ld$(TOOL_GCC3_SUFFIX3)
     63else
     64TOOL_GCC3_LD_SYSMOD ?= $(TOOL_GCC3_PREFIX2)ld$(TOOL_GCC3_SUFFIX2)
     65endif
    5266ifndef TOOL_GCC3_LDFLAGS.$(KBUILD_TARGET)
    5367 TOOL_GCC3_LDFLAGS.dll ?= -shared
     
    6478 TOOL_GCC3_LD_SYSMOD_MAP ?=
    6579endif
    66 if1of ($(KBUILD_HOST), solaris)
    67  TOOL_GCC3_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
    68 else
    69  TOOL_GCC3_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
    70 endif
     80TOOL_GCC3_OBJCOPY ?= $(TOOL_GCC3_PREFIX2)objcopy$(TOOL_GCC3_SUFFIX2)
    7181
    7282ifdef SLKRUNS
  • trunk/kBuild/tools/GCC32.kmk

    r3121 r3393  
    3636
    3737# Tool Specific Properties
    38 TOOL_GCC32_CC  ?= gcc$(HOSTSUFF_EXE) -m32
    39 TOOL_GCC32_CXX ?= g++$(HOSTSUFF_EXE) -m32
    40 TOOL_GCC32_AS  ?= gcc$(HOSTSUFF_EXE) -m32
    41 TOOL_GCC32_AR  ?= ar$(HOSTSUFF_EXE)
    42 TOOL_GCC32_LD  ?= gcc$(HOSTSUFF_EXE) -m32
    43 TOOL_GCC32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
     38ifndef TOOL_GCC32_PREFIX
     39 TOOL_GCC32_PREFIX :=
     40endif
     41ifndef TOOL_GCC32_SUFFIX
     42 TOOL_GCC32_SUFFIX := $(HOSTSUFF_EXE)
     43endif
     44if1of ($(KBUILD_HOST), solaris)
     45 TOOL_GCC32_PREFIX2  ?= g
     46else
     47 TOOL_GCC32_PREFIX2  ?=
     48endif
     49TOOL_GCC32_SUFFIX2   ?= $(HOSTSUFF_EXE)
     50TOOL_GCC32_PREFIX3   ?=
     51TOOL_GCC32_SUFFIX3   ?= $(HOSTSUFF_EXE)
     52
     53TOOL_GCC32_CC        ?= $(TOOL_GCC32_PREFIX)gcc$(TOOL_GCC32_SUFFIX) -m32
     54TOOL_GCC32_CXX       ?= $(TOOL_GCC32_PREFIX)g++$(TOOL_GCC32_SUFFIX) -m32
     55TOOL_GCC32_AS        ?= $(TOOL_GCC32_PREFIX)gcc$(TOOL_GCC32_SUFFIX) -m32
     56TOOL_GCC32_AR        ?= $(TOOL_GCC32_PREFIX2)ar$(TOOL_GCC32_SUFFIX2)
     57TOOL_GCC32_LD        ?= $(TOOL_GCC32_PREFIX)gcc$(TOOL_GCC32_SUFFIX) -m32
     58if1of ($(KBUILD_HOST), solaris)
     59 TOOL_GCC32_LD_SYSMOD ?= $(TOOL_GCC32_PREFIX3)ld$(TOOL_GCC32_SUFFIX3)
     60else
     61 TOOL_GCC32_LD_SYSMOD ?= $(TOOL_GCC32_PREFIX2)ld$(TOOL_GCC32_SUFFIX2)
     62endif
    4463ifndef TOOL_GCC32_LDFLAGS.$(KBUILD_TARGET)
    4564TOOL_GCC32_LDFLAGS.dll ?= -shared
     
    5978TOOL_GCC32_LD_SYSMOD_MAP ?=
    6079endif
    61 if1of ($(KBUILD_HOST), solaris)
    62  TOOL_GCC32_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
    63 else
    64  TOOL_GCC32_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
    65 endif
     80TOOL_GCC32_OBJCOPY ?= $(TOOL_GCC32_PREFIX2)objcopy$(TOOL_GCC32_SUFFIX2)
    6681
    6782ifdef SLKRUNS
  • trunk/kBuild/tools/GCC3OMF.kmk

    r3121 r3393  
    3535
    3636# Tool Specific Properties
    37 TOOL_GCC3OMF_CC  ?= gcc$(HOSTSUFF_EXE)
    38 TOOL_GCC3OMF_CXX ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GCC3OMF_AS  ?= gcc$(HOSTSUFF_EXE)
    40 TOOL_GCC3OMF_AR  ?= emxomfar$(HOSTSUFF_EXE)
    41 TOOL_GCC3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE)
    42 TOOL_GCC3OMF_LD ?= gcc$(HOSTSUFF_EXE)
    43 TOOL_GCC3OMF_LD_SYSMOD ?= gcc$(HOSTSUFF_EXE)
    44 ifndef TOOL_GCC3OMF_LDFLAGS.$(KBUILD_TARGET)
     37ifndef TOOL_GCC3OMF_PREFIX
     38 TOOL_GCC3OMF_PREFIX :=
     39endif
     40ifndef TOOL_GCC3OMF_SUFFIX
     41 TOOL_GCC3OMF_SUFFIX := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GCC3OMF_PREFIX2   ?=
     44TOOL_GCC3OMF_SUFFIX2   ?= $(HOSTSUFF_EXE)
     45TOOL_GCC3OMF_PREFIX3   ?=
     46TOOL_GCC3OMF_SUFFIX3   ?= $(HOSTSUFF_EXE)
     47TOOL_GCC3OMF_CC        ?= $(TOOL_GCC3OMF_PREFIX)gcc$(TOOL_GCC3OMF_SUFFIX)
     48TOOL_GCC3OMF_CXX       ?= $(TOOL_GCC3OMF_PREFIX)g++$(TOOL_GCC3OMF_SUFFIX)
     49TOOL_GCC3OMF_AS        ?= $(TOOL_GCC3OMF_PREFIX)gcc$(TOOL_GCC3OMF_SUFFIX)
     50TOOL_GCC3OMF_AR        ?= $(TOOL_GCC3OMF_PREFIX2)emxomfar$(TOOL_GCC3OMF_SUFFIX2)
     51TOOL_GCC3OMF_AR_IMP    ?= $(TOOL_GCC3OMF_PREFIX2)emximp$(TOOL_GCC3OMF_SUFFIX2)
     52TOOL_GCC3OMF_LD        ?= $(TOOL_GCC3OMF_PREFIX)gcc$(TOOL_GCC3OMF_SUFFIX)
     53TOOL_GCC3OMF_LD_SYSMOD ?= $(TOOL_GCC3OMF_PREFIX)gcc$(TOOL_GCC3OMF_SUFFIX)
    4554TOOL_GCC3OMF_LDFLAGS.dll ?= -shared -Zdll
    46 else
    47 TOOL_GCC3OMF_LDFLAGS.dll ?= $(TOOL_GCC3OMF_LDFLAGS.$(KBUILD_TARGET))
    48 endif
    4955TOOL_GCC3OMF_LDFLAGS.sysmod ?= -nostdlib
    5056TOOL_GCC3OMF_LD_MAP ?= -Zmap=$(1)
    5157TOOL_GCC3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
    52 TOOL_GCC3OMF_RC = rc$(HOSTSUFF_EXE)
     58
     59TOOL_GCC3OMF_RC = $(TOOL_GCC3OMF_PREFIX3)rc$(TOOL_GCC3OMF_SUFFIX3)
    5360
    5461ifdef SLKRUNS
  • trunk/kBuild/tools/GCC3PLAIN.kmk

    r3121 r3393  
    3535
    3636# Tool Specific Properties
    37 TOOL_GCC3PLAIN_CC  ?= gcc$(HOSTSUFF_EXE)
    38 TOOL_GCC3PLAIN_CXX ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GCC3PLAIN_AS  ?= gcc$(HOSTSUFF_EXE)
    40 TOOL_GCC3PLAIN_AR  ?= ar$(HOSTSUFF_EXE)
    41 TOOL_GCC3PLAIN_RANLIB ?= ranlib$(HOSTSUFF_EXE)
    42 TOOL_GCC3PLAIN_LD  ?= gcc$(HOSTSUFF_EXE)
    43 TOOL_GCC3PLAIN_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    44 TOOL_GCC3PLAIN_LD_SYSMOD.os2 ?= g++$(HOSTSUFF_EXE)
     37ifndef TOOL_GCC3PLAIN_PREFIX
     38 TOOL_GCC3PLAIN_PREFIX :=
     39endif
     40ifndef TOOL_GCC3PLAIN_SUFFIX
     41 TOOL_GCC3PLAIN_SUFFIX := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GCC3PLAIN_PREFIX2 ?= $(TOOL_GCC3PLAIN_PREFIX)
     44TOOL_GCC3PLAIN_SUFFIX2 ?= $(TOOL_GCC3PLAIN_SUFFIX)
     45TOOL_GCC3PLAIN_CC            ?= $(TOOL_GCC3PLAIN_PREFIX)gcc$(TOOL_GCC3PLAIN_SUFFIX)
     46TOOL_GCC3PLAIN_CXX           ?= $(TOOL_GCC3PLAIN_PREFIX)g++$(TOOL_GCC3PLAIN_SUFFIX)
     47TOOL_GCC3PLAIN_AS            ?= $(TOOL_GCC3PLAIN_PREFIX)gcc$(TOOL_GCC3PLAIN_SUFFIX)
     48TOOL_GCC3PLAIN_AR            ?= $(TOOL_GCC3PLAIN_PREFIX2)ar$(TOOL_GCC3PLAIN_SUFFIX2)
     49TOOL_GCC3PLAIN_RANLIB        ?= $(TOOL_GCC3PLAIN_PREFIX2)ranlib$(TOOL_GCC3PLAIN_SUFFIX2)
     50TOOL_GCC3PLAIN_LD            ?= $(TOOL_GCC3PLAIN_PREFIX)gcc$(TOOL_GCC3PLAIN_SUFFIX)
     51TOOL_GCC3PLAIN_LD_SYSMOD     ?= $(TOOL_GCC3PLAIN_PREFIX2)ld$(TOOL_GCC3PLAIN_SUFFIX2)
     52TOOL_GCC3PLAIN_LD_SYSMOD.os2 ?= $(TOOL_GCC3PLAIN_PREFIX)g++$(TOOL_GCC3PLAIN_SUFFIX)
    4553TOOL_GCC3PLAIN_LDFLAGS.dll.os2 ?= -Zdll
    4654TOOL_GCC3PLAIN_LDFLAGS.dll.darwin ?= -dynamiclib
     
    5058 TOOL_GCC3PLAIN_LDFLAGS.dll ?= $(TOOL_GCC3PLAIN_LDFLAGS.$(KBUILD_TARGET))
    5159endif
    52 TOOL_GCC3PLAIN_LD_SONAME.darwin ?= $(NO_SUCH_VARIABLE)
    53 TOOL_GCC3PLAIN_LD_SONAME.os2 ?= $(NO_SUCH_VARIABLE)
     60TOOL_GCC3PLAIN_LD_SONAME.darwin  ?= $(NO_SUCH_VARIABLE)
     61TOOL_GCC3PLAIN_LD_SONAME.os2     ?= $(NO_SUCH_VARIABLE)
    5462TOOL_GCC3PLAIN_LD_SONAME.solaris ?= -Wl,-h,$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    55 TOOL_GCC3PLAIN_LD_SONAME.win ?= $(NO_SUCH_VARIABLE)
     63TOOL_GCC3PLAIN_LD_SONAME.win     ?= $(NO_SUCH_VARIABLE)
    5664ifndef TOOL_GCC3PLAIN_LD_SONAME.$(KBUILD_TARGET)
    5765 TOOL_GCC3PLAIN_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
  • trunk/kBuild/tools/GCC42MACHO.kmk

    r3121 r3393  
    3535
    3636# Tool Specific Properties
    37 TOOL_GCC42MACHO_PREFIX    ?=
    38 TOOL_GCC42MACHO_SUFFIX    ?= -4.2$(HOSTSUFF_EXE)
     37ifndef TOOL_GCC42MACHO_PREFIX
     38 TOOL_GCC42MACHO_PREFIX   :=
     39endif
     40ifndef TOOL_GCC42MACHO_SUFFIX
     41 TOOL_GCC42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
     42endif
     43TOOL_GCC42MACHO_PREFIX2   ?=
     44TOOL_GCC42MACHO_SUFFIX2   ?=
    3945TOOL_GCC42MACHO_CC        ?= $(TOOL_GCC42MACHO_PREFIX)gcc$(TOOL_GCC42MACHO_SUFFIX)
    4046TOOL_GCC42MACHO_CXX       ?= $(TOOL_GCC42MACHO_PREFIX)g++$(TOOL_GCC42MACHO_SUFFIX)
     
    4450TOOL_GCC42MACHO_LD        ?= $(TOOL_GCC42MACHO_PREFIX)gcc$(TOOL_GCC42MACHO_SUFFIX)
    4551TOOL_GCC42MACHO_LD_SYSMOD ?= $(TOOL_GCC42MACHO_PREFIX)gcc$(TOOL_GCC42MACHO_SUFFIX)
    46 ifndef TOOL_GCC42MACHO_LDFLAGS.$(KBUILD_TARGET)
    4752TOOL_GCC42MACHO_LDFLAGS.dll ?= -dynamiclib
    48 else
    49 TOOL_GCC42MACHO_LDFLAGS.dll ?= $(TOOL_GCC42MACHO_LDFLAGS.$(KBUILD_TARGET))
    50 endif
    5153TOOL_GCC42MACHO_LDFLAGS.sysmod ?= -r
    5254#TOOL_GCC42MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    53 TOOL_GCC42MACHO_DSYMUTIL  ?= dsymutil
    5455
    5556ifdef SLKRUNS
     
    5960TOOL_GCC42MACHO_OBJCXX    += -fmessage-length=0
    6061endif
     62
     63TOOL_GCC42MACHO_AR        ?= $(TOOL_GCC4MACHO_PREFIX2)ar$(TOOL_GCC4MACHO_SUFFIX2)
     64TOOL_GCC42MACHO_DSYMUTIL  ?= $(TOOL_GCC4MACHO_PREFIX2)dsymutil$(TOOL_GCC4MACHO_SUFFIX2)
     65TOOL_GCC42MACHO_STRIP     ?= $(TOOL_GCC4MACHO_PREFIX2)strip$(TOOL_GCC4MACHO_SUFFIX2)
     66TOOL_GCC42MACHO_STRIP_PROGRAM ?= $(TOOL_GCC42MACHO_STRIP) -SXxru
     67TOOL_GCC42MACHO_STRIP_DLL     ?= $(TOOL_GCC42MACHO_STRIP) -Sxru
     68TOOL_GCC42MACHO_STRIP_SYSMOD  ?= $(TOOL_GCC42MACHO_STRIP) -Sru
    6169
    6270# General Properties used by kBuild
     
    98106TOOL_GCC42MACHO_ASOBJSUFF        ?= .o
    99107
    100 TOOL_GCC42MACHO_AR               ?= ar$(HOSTSUFF_EXE)
    101108TOOL_GCC42MACHO_ARFLAGS          ?= -c -rs
    102109TOOL_GCC42MACHO_ARLIBSUFF        ?= .a
     
    105112TOOL_GCC42MACHO_LDFLAGS.debug    ?= -g
    106113TOOL_GCC42MACHO_LDFLAGS.profile  ?= -g
    107 
    108 TOOL_GCC42MACHO_STRIP_PROGRAM    ?= strip -SXxru
    109 TOOL_GCC42MACHO_STRIP_DLL        ?= strip -Sxru
    110 TOOL_GCC42MACHO_STRIP_SYSMOD     ?= strip -Sru
    111114
    112115
  • trunk/kBuild/tools/GCC4MACHO.kmk

    r3121 r3393  
    3535
    3636# Tool Specific Properties
    37 TOOL_GCC4MACHO_PREFIX    ?=
    38 TOOL_GCC4MACHO_SUFFIX    ?= $(HOSTSUFF_EXE)
     37ifndef TOOL_GCC4MACHO_PREFIX
     38 TOOL_GCC4MACHO_PREFIX   :=
     39endif
     40ifndef TOOL_GCC4MACHO_SUFFIX
     41 TOOL_GCC4MACHO_SUFFIX   := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GCC4MACHO_PREFIX2   ?=
     44TOOL_GCC4MACHO_SUFFIX2   ?= $(HOSTSUFF_EXE)
    3945TOOL_GCC4MACHO_CC        ?= $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX)
    4046TOOL_GCC4MACHO_CXX       ?= $(TOOL_GCC4MACHO_PREFIX)g++$(TOOL_GCC4MACHO_SUFFIX)
     
    4450TOOL_GCC4MACHO_LD        ?= $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX)
    4551TOOL_GCC4MACHO_LD_SYSMOD ?= $(TOOL_GCC4MACHO_PREFIX)gcc$(TOOL_GCC4MACHO_SUFFIX)
    46 ifndef TOOL_GCC4MACHO_LDFLAGS.$(KBUILD_TARGET)
    4752TOOL_GCC4MACHO_LDFLAGS.dll ?= -dynamiclib
    48 else
    49 TOOL_GCC4MACHO_LDFLAGS.dll ?= $(TOOL_GCC4MACHO_LDFLAGS.$(KBUILD_TARGET))
    50 endif
    5153TOOL_GCC4MACHO_LDFLAGS.sysmod ?= -r
    5254#TOOL_GCC4MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    53 TOOL_GCC4MACHO_DSYMUTIL  ?= dsymutil
     55
     56TOOL_GCC4MACHO_AR        ?= $(TOOL_GCC4MACHO_PREFIX2)ar$(TOOL_GCC4MACHO_SUFFIX2)
     57TOOL_GCC4MACHO_DSYMUTIL  ?= $(TOOL_GCC4MACHO_PREFIX2)dsymutil$(TOOL_GCC4MACHO_SUFFIX2)
     58TOOL_GCC4MACHO_STRIP     ?= $(TOOL_GCC4MACHO_PREFIX2)strip$(TOOL_GCC4MACHO_SUFFIX2)
     59TOOL_GCC4MACHO_STRIP_PROGRAM ?= $(TOOL_GCC4MACHO_STRIP) -SXxru
     60TOOL_GCC4MACHO_STRIP_DLL     ?= $(TOOL_GCC4MACHO_STRIP) -Sxru
     61TOOL_GCC4MACHO_STRIP_SYSMOD  ?= $(TOOL_GCC4MACHO_STRIP) -Sru
    5462
    5563ifdef SLKRUNS
     
    98106TOOL_GCC4MACHO_ASOBJSUFF        ?= .o
    99107
    100 TOOL_GCC4MACHO_AR               ?= ar$(HOSTSUFF_EXE)
    101108TOOL_GCC4MACHO_ARFLAGS          ?= -c -rs
    102109TOOL_GCC4MACHO_ARLIBSUFF        ?= .a
     
    105112TOOL_GCC4MACHO_LDFLAGS.debug    ?= -g
    106113TOOL_GCC4MACHO_LDFLAGS.profile  ?= -g
    107 
    108 TOOL_GCC4MACHO_STRIP_PROGRAM    ?= strip -SXxru
    109 TOOL_GCC4MACHO_STRIP_DLL        ?= strip -Sxru
    110 TOOL_GCC4MACHO_STRIP_SYSMOD     ?= strip -Sru
    111114
    112115
  • trunk/kBuild/tools/GCC64.kmk

    r3121 r3393  
    3636
    3737# Tool Specific Properties
    38 TOOL_GCC64_CC  ?= gcc$(HOSTSUFF_EXE) -m64
    39 TOOL_GCC64_CXX ?= g++$(HOSTSUFF_EXE) -m64
    40 TOOL_GCC64_AS  ?= gcc$(HOSTSUFF_EXE) -m64
    41 TOOL_GCC64_AR  ?= ar$(HOSTSUFF_EXE)
    42 TOOL_GCC64_LD  ?= gcc$(HOSTSUFF_EXE) -m64
    43 TOOL_GCC64_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
     38ifndef TOOL_GCC64_PREFIX
     39 TOOL_GCC64_PREFIX :=
     40endif
     41ifndef TOOL_GCC64_SUFFIX
     42 TOOL_GCC64_SUFFIX := $(HOSTSUFF_EXE)
     43endif
     44if1of ($(KBUILD_HOST), solaris)
     45 TOOL_GCC64_PREFIX2  ?= g
     46else
     47 TOOL_GCC64_PREFIX2  ?=
     48endif
     49TOOL_GCC64_SUFFIX2   ?= $(HOSTSUFF_EXE)
     50TOOL_GCC64_PREFIX3   ?=
     51TOOL_GCC64_SUFFIX3   ?= $(HOSTSUFF_EXE)
     52TOOL_GCC64_CC        ?= $(TOOL_GCC64_PREFIX)gcc$(TOOL_GCC64_SUFFIX) -m64
     53TOOL_GCC64_CXX       ?= $(TOOL_GCC64_PREFIX)g++$(TOOL_GCC64_SUFFIX) -m64
     54TOOL_GCC64_AS        ?= $(TOOL_GCC64_PREFIX)gcc$(TOOL_GCC64_SUFFIX) -m64
     55TOOL_GCC64_AR        ?= $(TOOL_GCC64_PREFIX2)ar$(TOOL_GCC64_SUFFIX2)
     56TOOL_GCC64_LD        ?= $(TOOL_GCC64_PREFIX)gcc$(TOOL_GCC64_SUFFIX) -m64
     57if1of ($(KBUILD_HOST), solaris)
     58 TOOL_GCC64_LD_SYSMOD ?= $(TOOL_GCC64_PREFIX3)ld$(TOOL_GCC64_SUFFIX3)
     59else
     60 TOOL_GCC64_LD_SYSMOD ?= $(TOOL_GCC64_PREFIX2)ld$(TOOL_GCC64_SUFFIX2)
     61endif
    4462ifndef TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET)
    45 TOOL_GCC64_LDFLAGS.dll ?= -shared
    46 else
    47 TOOL_GCC64_LDFLAGS.dll ?= $(TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET))
     63 TOOL_GCC64_LDFLAGS.dll ?= -shared
     64else
     65 TOOL_GCC64_LDFLAGS.dll ?= $(TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET))
    4866endif
    4967TOOL_GCC64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "gnukfbsd",_fbsd,)
    5068TOOL_GCC64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5169ifeq ($(KBUILD_TARGET),os2)
    52 TOOL_GCC64_LD_MAP ?= -Zmap=$(1)
    53 else
    54 TOOL_GCC64_LD_MAP ?=
     70 TOOL_GCC64_LD_MAP ?= -Zmap=$(1)
     71else
     72 TOOL_GCC64_LD_MAP ?=
    5573endif
    5674ifeq ($(KBUILD_TARGET),os2)
    57 TOOL_GCC64_LD_SYSMOD_MAP ?= -Zmap=$(1)
    58 else
    59 TOOL_GCC64_LD_SYSMOD_MAP ?=
    60 endif
    61 if1of ($(KBUILD_HOST), solaris)
    62  TOOL_GCC64_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
    63 else
    64  TOOL_GCC64_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
    65 endif
     75 TOOL_GCC64_LD_SYSMOD_MAP ?= -Zmap=$(1)
     76else
     77 TOOL_GCC64_LD_SYSMOD_MAP ?=
     78endif
     79TOOL_GCC64_OBJCOPY ?= $(TOOL_GCC64_PREFIX2)gobjcopy$(TOOL_GCC64_SUFFIX2)
    6680
    6781ifdef SLKRUNS
  • trunk/kBuild/tools/GXX.kmk

    r3391 r3393  
    3636# Tool Specific Properties
    3737ifndef TOOL_GXX_PREFIX
    38  TOOL_GXX_PREFIX :=
     38 TOOL_GXX_PREFIX  :=
    3939endif
    4040ifndef TOOL_GXX_SUFFIX
    41  TOOL_GXX_SUFFIX := $(HOSTSUFF_EXE)
    42 endif
    43 TOOL_GXX_CC     ?= $(TOOL_GXX_PREFIX)gcc$(TOOL_GXX_SUFFIX)
    44 TOOL_GXX_CXX    ?= $(TOOL_GXX_PREFIX)g++$(TOOL_GXX_SUFFIX)
    45 TOOL_GXX_PCH    ?= $(TOOL_GXX_CXX)
    46 TOOL_GXX_AS     ?= $(TOOL_GXX_PREFIX)gcc$(TOOL_GXX_SUFFIX)
    47 TOOL_GXX_AR     ?= $(TOOL_GXX_PREFIX)ar$(TOOL_GXX_SUFFIX)
    48 TOOL_GXX_RANLIB ?= $(TOOL_GXX_PREFIX)ranlib$(TOOL_GXX_SUFFIX)
    49 TOOL_GXX_LD     ?= $(TOOL_GXX_PREFIX)g++$(TOOL_GXX_SUFFIX)
     41 TOOL_GXX_SUFFIX  := $(HOSTSUFF_EXE)
     42endif
     43if1of ($(KBUILD_HOST), solaris)
     44 TOOL_GXX_PREFIX2 ?= g
     45else
     46 TOOL_GXX_PREFIX2 ?=
     47endif
     48TOOL_GXX_SUFFIX2  ?= $(HOSTSUFF_EXE)
     49TOOL_GXX_PREFIX3  ?=
     50TOOL_GXX_SUFFIX3  ?= $(HOSTSUFF_EXE)
     51TOOL_GXX_CC       ?= $(TOOL_GXX_PREFIX)gcc$(TOOL_GXX_SUFFIX)
     52TOOL_GXX_CXX      ?= $(TOOL_GXX_PREFIX)g++$(TOOL_GXX_SUFFIX)
     53TOOL_GXX_PCH      ?= $(TOOL_GXX_CXX)
     54TOOL_GXX_AS       ?= $(TOOL_GXX_PREFIX)gcc$(TOOL_GXX_SUFFIX)
     55TOOL_GXX_AR       ?= $(TOOL_GXX_PREFIX2)ar$(TOOL_GXX_SUFFIX2)
     56TOOL_GXX_RANLIB   ?= $(TOOL_GXX_PREFIX2)ranlib$(TOOL_GXX_SUFFIX2)
     57TOOL_GXX_LD       ?= $(TOOL_GXX_PREFIX)g++$(TOOL_GXX_SUFFIX)
    5058TOOL_GXX_LDFLAGS.dll.os2    ?= -Zdll
    5159TOOL_GXX_LDFLAGS.dll.darwin ?= -dynamiclib
  • trunk/kBuild/tools/GXX3.kmk

    r3391 r3393  
    3636# Tool Specific Properties
    3737ifndef TOOL_GXX3_PREFIX
    38  TOOL_GXX3_PREFIX :=
     38 TOOL_GXX3_PREFIX   :=
    3939endif
    4040ifndef TOOL_GXX3_SUFFIX
    41  TOOL_GXX3_SUFFIX := $(HOSTSUFF_EXE)
    42 endif
    43 TOOL_GXX3_CC  ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
    44 TOOL_GXX3_CXX ?= $(TOOL_GXX3_PREFIX)g++$(TOOL_GXX3_SUFFIX)
    45 TOOL_GXX3_PCH ?= $(TOOL_GXX3_CXX)
    46 TOOL_GXX3_AS  ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
    47 if1of ($(KBUILD_TARGET),solaris)
    48  TOOL_GXX3_AR ?= $(TOOL_GXX3_PREFIX)gar$(TOOL_GXX3_SUFFIX)
    49 else
    50  TOOL_GXX3_AR ?= $(TOOL_GXX3_PREFIX)ar$(TOOL_GXX3_SUFFIX)
    51 endif
     41 TOOL_GXX3_SUFFIX   := $(HOSTSUFF_EXE)
     42endif
     43if1of ($(KBUILD_HOST), solaris)
     44 TOOL_GXX3_PREFIX2  ?= g
     45else
     46 TOOL_GXX3_PREFIX2  ?=
     47endif
     48TOOL_GXX3_SUFFIX2   ?= $(HOSTSUFF_EXE)
     49TOOL_GXX3_PREFIX3   ?=
     50TOOL_GXX3_SUFFIX3   ?= $(HOSTSUFF_EXE)
     51
     52TOOL_GXX3_CC        ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
     53TOOL_GXX3_CXX       ?= $(TOOL_GXX3_PREFIX)g++$(TOOL_GXX3_SUFFIX)
     54TOOL_GXX3_PCH       ?= $(TOOL_GXX3_CXX)
     55TOOL_GXX3_AS        ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
     56TOOL_GXX3_AR        ?= $(TOOL_GXX3_PREFIX2)ar$(TOOL_GXX3_SUFFIX2)
    5257ifeq ($(KBUILD_TARGET),os2)
    53  TOOL_GXX3_AR_IMP   ?= $(TOOL_GXX3_PREFIX)emximp$(TOOL_GXX3_SUFFIX)
     58 TOOL_GXX3_AR_IMP   ?= $(TOOL_GXX3_PREFIX3)emximp$(TOOL_GXX3_SUFFIX3)
    5459else
    5560 TOOL_GXX3_AR_IMP   ?= $(ECHO) not supported!
    5661endif
    5762TOOL_GXX3_LD        ?= $(TOOL_GXX3_PREFIX)g++$(TOOL_GXX3_SUFFIX)
    58 TOOL_GXX3_LD_SYSMOD ?= $(TOOL_GXX3_PREFIX)ld$(TOOL_GXX3_SUFFIX)
     63if1of ($(KBUILD_HOST), solaris)
     64 TOOL_GXX3_LD_SYSMOD ?= $(TOOL_GXX3_PREFIX3)ld$(TOOL_GXX3_SUFFIX3)
     65else
     66 TOOL_GXX3_LD_SYSMOD ?= $(TOOL_GXX3_PREFIX2)ld$(TOOL_GXX3_SUFFIX2)
     67endif
    5968ifndef TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET)
    6069 TOOL_GXX3_LDFLAGS.dll   ?= -shared
     
    7180 TOOL_GXX3_LD_SYSMOD_MAP ?=
    7281endif
    73 if1of ($(KBUILD_HOST), solaris)
    74  TOOL_GXX3_OBJCOPY  ?= $(TOOL_GXX3_PREFIX)gobjcopy$(TOOL_GXX3_SUFFIX)
    75 else
    76  TOOL_GXX3_OBJCOPY  ?= $(TOOL_GXX3_PREFIX)objcopy$(TOOL_GXX3_SUFFIX)
    77 endif
     82TOOL_GXX3_OBJCOPY ?= $(TOOL_GXX3_PREFIX)objcopy$(TOOL_GXX3_SUFFIX)
    7883
    7984ifdef SLKRUNS
  • trunk/kBuild/tools/GXX32.kmk

    r3391 r3393  
    3737# Tool Specific Properties
    3838ifndef TOOL_GXX32_PREFIX
    39  TOOL_GXX32_PREFIX :=
     39 TOOL_GXX32_PREFIX  :=
    4040endif
    4141ifndef TOOL_GXX32_SUFFIX
    42  TOOL_GXX32_SUFFIX := $(HOSTSUFF_EXE)
    43 endif
    44 TOOL_GXX32_CC  ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
    45 TOOL_GXX32_CXX ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
    46 TOOL_GXX32_PCH ?= $(TOOL_GXX32_CXX)
    47 TOOL_GXX32_AS  ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
    48 if1of ($(KBUILD_TARGET),solaris)
    49  TOOL_GXX32_AR ?= $(TOOL_GXX32_PREFIX)gar$(TOOL_GXX32_SUFFIX)
    50 else
    51  TOOL_GXX32_AR ?= $(TOOL_GXX32_PREFIX)ar$(TOOL_GXX32_SUFFIX)
    52 endif
    53 TOOL_GXX32_LD  ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
    54 TOOL_GXX32_LD_SYSMOD ?= $(TOOL_GXX32_PREFIX)ld$(TOOL_GXX32_SUFFIX)
     42 TOOL_GXX32_SUFFIX  := $(HOSTSUFF_EXE)
     43endif
     44if1of ($(KBUILD_HOST), solaris)
     45 TOOL_GXX32_PREFIX2 ?= g
     46else
     47 TOOL_GXX32_PREFIX2 ?=
     48endif
     49TOOL_GXX32_SUFFIX2  ?= $(HOSTSUFF_EXE)
     50TOOL_GXX32_PREFIX3  ?=
     51TOOL_GXX32_SUFFIX3  ?= $(HOSTSUFF_EXE)
     52TOOL_GXX32_CC       ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
     53TOOL_GXX32_CXX      ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
     54TOOL_GXX32_PCH      ?= $(TOOL_GXX32_CXX)
     55TOOL_GXX32_AS       ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
     56TOOL_GXX32_AR       ?= $(TOOL_GXX32_PREFIX2)ar$(TOOL_GXX32_SUFFIX2)
     57TOOL_GXX32_LD       ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
     58if1of ($(KBUILD_HOST), solaris)
     59 TOOL_GXX32_LD_SYSMOD ?= $(TOOL_GXX32_PREFIX3)ld$(TOOL_GXX32_SUFFIX3)
     60else
     61 TOOL_GXX32_LD_SYSMOD ?= $(TOOL_GXX32_PREFIX2)ld$(TOOL_GXX32_SUFFIX2)
     62endif
    5563ifndef TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET)
    5664 TOOL_GXX32_LDFLAGS.dll ?= -shared
     
    7078 TOOL_GXX32_LD_SYSMOD_MAP ?=
    7179endif
    72 if1of ($(KBUILD_HOST), solaris)
    73  TOOL_GXX32_OBJCOPY ?= $(TOOL_GXX32_PREFIX)gobjcopy$(TOOL_GXX32_SUFFIX)
    74 else
    75  TOOL_GXX32_OBJCOPY ?= $(TOOL_GXX32_PREFIX)objcopy$(TOOL_GXX32_SUFFIX)
    76 endif
     80TOOL_GXX32_OBJCOPY ?= $(TOOL_GXX32_PREFIX2)objcopy$(TOOL_GXX32_SUFFIX)
    7781
    7882ifdef SLKRUNS
  • trunk/kBuild/tools/GXX3OMF.kmk

    r3391 r3393  
    3636# Tool Specific Properties
    3737ifndef TOOL_GXX3OMF_PREFIX
    38  TOOL_GXX3OMF_PREFIX :=
     38 TOOL_GXX3OMF_PREFIX   :=
    3939endif
    4040ifndef TOOL_GXX3OMF_SUFFIX
    41  TOOL_GXX3OMF_SUFFIX := $(HOSTSUFF_EXE)
    42 endif
     41 TOOL_GXX3OMF_SUFFIX   := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GXX3OMF_PREFIX2   ?=
     44TOOL_GXX3OMF_SUFFIX2   ?= $(HOSTSUFF_EXE)
     45TOOL_GXX3OMF_PREFIX3   ?=
     46TOOL_GXX3OMF_SUFFIX3   ?= $(HOSTSUFF_EXE)
    4347TOOL_GXX3OMF_CC        ?= $(TOOL_GXX3OMF_PREFIX)gcc$(TOOL_GXX3OMF_SUFFIX)
    4448TOOL_GXX3OMF_CXX       ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
    4549TOOL_GXX3OMF_PCH       ?= $(TOOL_GXX3OMF_CXX)
    4650TOOL_GXX3OMF_AS        ?= $(TOOL_GXX3OMF_PREFIX)gcc$(TOOL_GXX3OMF_SUFFIX)
    47 TOOL_GXX3OMF_AR        ?= $(TOOL_GXX3OMF_PREFIX)emxomfar$(TOOL_GXX3OMF_SUFFIX)
    48 TOOL_GXX3OMF_AR_IMP    ?= $(TOOL_GXX3OMF_PREFIX)emximp$(TOOL_GXX3OMF_SUFFIX)
     51TOOL_GXX3OMF_AR        ?= $(TOOL_GXX3OMF_PREFIX2)emxomfar$(TOOL_GXX3OMF_SUFFIX2)
     52TOOL_GXX3OMF_AR_IMP    ?= $(TOOL_GXX3OMF_PREFIX2)emximp$(TOOL_GXX3OMF_SUFFIX2)
    4953TOOL_GXX3OMF_LD        ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
    5054TOOL_GXX3OMF_LD_SYSMOD ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
     
    5862TOOL_GXX3OMF_LD_SYSMOD_MAP  ?= -Zmap=$(1)
    5963
    60 TOOL_GXX3OMF_RC_PREFIX ?= $(TOOL_GXX3OMF_PREFIX)
    61 TOOL_GXX3OMF_RC_SUFFIX ?= $(TOOL_GXX3OMF_SUFFIX)
    62 TOOL_GXX3OMF_RC = $(TOOL_GXX3OMF_RC_PREFIX)rc$(TOOL_GXX3OMF_RC_SUFFIX)
     64TOOL_GXX3OMF_RC = $(TOOL_GXX3OMF_PREFIX3)rc$(TOOL_GXX3OMF_SUFFIX3)
    6365
    6466ifdef SLKRUNS
  • trunk/kBuild/tools/GXX3PLAIN.kmk

    r3391 r3393  
    4141 TOOL_GXX3PLAIN_SUFFIX := $(HOSTSUFF_EXE)
    4242endif
     43TOOL_GXX3PLAIN_PREFIX2  ?=
     44TOOL_GXX3PLAIN_SUFFIX2  ?= $(HOSTSUFF_EXE)
    4345TOOL_GXX3PLAIN_CC            ?= $(TOOL_GXX3PLAIN_PREFIX)gcc$(TOOL_GXX3PLAIN_SUFFIX)
    4446TOOL_GXX3PLAIN_CXX           ?= $(TOOL_GXX3PLAIN_PREFIX)g++$(TOOL_GXX3PLAIN_SUFFIX)
    4547TOOL_GXX3PLAIN_PCH           ?= $(TOOL_GXX3PLAIN_CXX)
    4648TOOL_GXX3PLAIN_AS            ?= $(TOOL_GXX3PLAIN_PREFIX)gcc$(TOOL_GXX3PLAIN_SUFFIX)
    47 TOOL_GXX3PLAIN_AR            ?= $(TOOL_GXX3PLAIN_PREFIX)ar$(TOOL_GXX3PLAIN_SUFFIX)
    48 TOOL_GXX3PLAIN_RANLIB        ?= $(TOOL_GXX3PLAIN_PREFIX)ranlib$(TOOL_GXX3PLAIN_SUFFIX)
     49TOOL_GXX3PLAIN_AR            ?= $(TOOL_GXX3PLAIN_PREFIX2)ar$(TOOL_GXX3PLAIN_SUFFIX2)
     50TOOL_GXX3PLAIN_RANLIB        ?= $(TOOL_GXX3PLAIN_PREFIX2)ranlib$(TOOL_GXX3PLAIN_SUFFIX2)
    4951TOOL_GXX3PLAIN_LD            ?= $(TOOL_GXX3PLAIN_PREFIX)g++$(TOOL_GXX3PLAIN_SUFFIX)
    50 TOOL_GXX3PLAIN_LD_SYSMOD     ?= $(TOOL_GXX3PLAIN_PREFIX)ld$(TOOL_GXX3PLAIN_SUFFIX)
     52TOOL_GXX3PLAIN_LD_SYSMOD     ?= $(TOOL_GXX3PLAIN_PREFIX2)ld$(TOOL_GXX3PLAIN_SUFFIX2)
    5153TOOL_GXX3PLAIN_LD_SYSMOD.os2 ?= $(TOOL_GXX3PLAIN_PREFIX)g++$(TOOL_GXX3PLAIN_SUFFIX)
    5254TOOL_GXX3PLAIN_LDFLAGS.dll.os2 ?= -Zdll
  • trunk/kBuild/tools/GXX42MACHO.kmk

    r3391 r3393  
    4141 TOOL_GXX42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
    4242endif
     43TOOL_GXX42MACHO_PREFIX2   ?=
     44TOOL_GXX42MACHO_SUFFIX2   ?= $(HOSTSUFF_EXE)
    4345TOOL_GXX42MACHO_CC        ?= $(TOOL_GXX42MACHO_PREFIX)gcc$(TOOL_GXX42MACHO_SUFFIX)
    4446TOOL_GXX42MACHO_CXX       ?= $(TOOL_GXX42MACHO_PREFIX)g++$(TOOL_GXX42MACHO_SUFFIX)
     
    5254TOOL_GXX42MACHO_LDFLAGS.sysmod ?= -r
    5355#TOOL_GXX42MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    54 TOOL_GXX42MACHO_DSYMUTIL_PREFIX ?=
    55 TOOL_GXX42MACHO_DSYMUTIL_SUFFIX ?= $(HOSTSUFF_EXE)
    56 TOOL_GXX42MACHO_DSYMUTIL  ?= $(TOOL_GXX42MACHO_DSYMUTIL_PREFIX)dsymutil$(TOOL_GXX42MACHO_DSYMUTIL_SUFFIX)
     56
     57TOOL_GXX42MACHO_AR        ?= $(TOOL_GXX42MACHO_PREFIX2)ar$(TOOL_GXX42MACHO_SUFFIX2)
     58TOOL_GXX42MACHO_DSYMUTIL  ?= $(TOOL_GXX42MACHO_PREFIX2)dsymutil$(TOOL_GXX42MACHO_SUFFIX2)
     59TOOL_GXX42MACHO_STRIP     ?= $(TOOL_GXX42MACHO_PREFIX2)strip$(TOOL_GXX42MACHO_SUFFIX2)
     60TOOL_GXX42MACHO_STRIP_PROGRAM    ?= $(TOOL_GXX42MACHO_STRIP) -SXxru
     61TOOL_GXX42MACHO_STRIP_DLL        ?= $(TOOL_GXX42MACHO_STRIP) -Sxru
     62TOOL_GXX42MACHO_STRIP_SYSMOD     ?= $(TOOL_GXX42MACHO_STRIP) -Sru
    5763
    5864ifdef SLKRUNS
     
    109115TOOL_GXX42MACHO_ASOBJSUFF        ?= .o
    110116
    111 TOOL_GXX42MACHO_AR               ?= ar$(HOSTSUFF_EXE)
    112117TOOL_GXX42MACHO_ARFLAGS          ?= -c -rs
    113118TOOL_GXX42MACHO_ARLIBSUFF        ?= .a
     
    116121TOOL_GXX42MACHO_LDFLAGS.debug    ?= -g
    117122TOOL_GXX42MACHO_LDFLAGS.profile  ?= -g
    118 
    119 TOOL_GXX42MACHO_STRIP_PROGRAM    ?= strip -SXxru
    120 TOOL_GXX42MACHO_STRIP_DLL        ?= strip -Sxru
    121 TOOL_GXX42MACHO_STRIP_SYSMOD     ?= strip -Sru
    122123
    123124
  • trunk/kBuild/tools/GXX4MACHO.kmk

    r3391 r3393  
    4141 TOOL_GXX4MACHO_SUFFIX   := $(HOSTSUFF_EXE)
    4242endif
     43TOOL_GXX4MACHO_PREFIX2   ?=
     44TOOL_GXX4MACHO_SUFFIX2   ?= $(HOSTSUFF_EXE)
    4345TOOL_GXX4MACHO_CC        ?= $(TOOL_GXX4MACHO_PREFIX)gcc$(TOOL_GXX4MACHO_SUFFIX)
    4446TOOL_GXX4MACHO_CXX       ?= $(TOOL_GXX4MACHO_PREFIX)g++$(TOOL_GXX4MACHO_SUFFIX)
     
    5254TOOL_GXX4MACHO_LDFLAGS.sysmod ?= -r
    5355#TOOL_GXX4MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    54 TOOL_GXX4MACHO_DSYMUTIL_PREFIX ?=
    55 TOOL_GXX4MACHO_DSYMUTIL_SUFFIX ?= $(HOSTSUFF_EXE)
    56 TOOL_GXX4MACHO_DSYMUTIL  ?= $(TOOL_GXX4MACHO_DSYMUTIL_PREFIX)dsymutil$(TOOL_GXX4MACHO_DSYMUTIL_SUFFIX)
     56
     57TOOL_GXX4MACHO_AR        ?= $(TOOL_GXX4MACHO_PREFIX2)ar$(TOOL_GXX4MACHO_SUFFIX2)
     58TOOL_GXX4MACHO_DSYMUTIL  ?= $(TOOL_GXX4MACHO_PREFIX2)dsymutil$(TOOL_GXX4MACHO_SUFFIX2)
     59TOOL_GXX4MACHO_STRIP     ?= $(TOOL_GXX4MACHO_PREFIX2)strip$(TOOL_GXX4MACHO_SUFFIX2)
     60TOOL_GXX4MACHO_STRIP_PROGRAM ?= $(TOOL_GXX4MACHO_STRIP) -SXxru
     61TOOL_GXX4MACHO_STRIP_DLL     ?= $(TOOL_GXX4MACHO_STRIP) -Sxru
     62TOOL_GXX4MACHO_STRIP_SYSMOD  ?= $(TOOL_GXX4MACHO_STRIP) -Sru
    5763
    5864ifdef SLKRUNS
     
    109115TOOL_GXX4MACHO_ASOBJSUFF        ?= .o
    110116
    111 TOOL_GXX4MACHO_AR               ?= ar$(HOSTSUFF_EXE)
    112117TOOL_GXX4MACHO_ARFLAGS          ?= -c -rs
    113118TOOL_GXX4MACHO_ARLIBSUFF        ?= .a
     
    116121TOOL_GXX4MACHO_LDFLAGS.debug    ?= -g
    117122TOOL_GXX4MACHO_LDFLAGS.profile  ?= -g
    118 
    119 TOOL_GXX4MACHO_STRIP_PROGRAM    ?= strip -SXxru
    120 TOOL_GXX4MACHO_STRIP_DLL        ?= strip -Sxru
    121 TOOL_GXX4MACHO_STRIP_SYSMOD     ?= strip -Sru
    122123
    123124
  • trunk/kBuild/tools/GXX64.kmk

    r3391 r3393  
    3737# Tool Specific Properties
    3838ifndef TOOL_GXX64_PREFIX
    39  TOOL_GXX64_PREFIX :=
     39 TOOL_GXX64_PREFIX  :=
    4040endif
    4141ifndef TOOL_GXX64_SUFFIX
    42  TOOL_GXX64_SUFFIX := $(HOSTSUFF_EXE)
    43 endif
    44 TOOL_GXX64_CC  ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
    45 TOOL_GXX64_CXX ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
    46 TOOL_GXX64_PCH ?= $(TOOL_GXX64_CXX)
    47 TOOL_GXX64_AS  ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
     42 TOOL_GXX64_SUFFIX  := $(HOSTSUFF_EXE)
     43endif
    4844if1of ($(KBUILD_HOST), solaris)
    49  TOOL_GXX64_AR ?= $(TOOL_GXX64_PREFIX)gar$(TOOL_GXX64_SUFFIX)
    50 else
    51  TOOL_GXX64_AR ?= $(TOOL_GXX64_PREFIX)ar$(TOOL_GXX64_SUFFIX)
    52 endif
    53 TOOL_GXX64_LD  ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
    54 TOOL_GXX64_LD_SYSMOD ?= $(TOOL_GXX64_PREFIX)ld$(TOOL_GXX64_SUFFIX)
     45 TOOL_GXX64_PREFIX2 ?= g
     46else
     47 TOOL_GXX64_PREFIX2 ?=
     48endif
     49TOOL_GXX64_SUFFIX2  ?= $(HOSTSUFF_EXE)
     50TOOL_GXX64_PREFIX3  ?=
     51TOOL_GXX64_SUFFIX3  ?= $(HOSTSUFF_EXE)
     52TOOL_GXX64_CC       ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
     53TOOL_GXX64_CXX      ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
     54TOOL_GXX64_PCH      ?= $(TOOL_GXX64_CXX)
     55TOOL_GXX64_AS       ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
     56TOOL_GXX64_AR       ?= $(TOOL_GXX64_PREFIX2)ar$(TOOL_GXX64_SUFFIX2)
     57TOOL_GXX64_LD       ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
     58if1of ($(KBUILD_HOST), solaris)
     59 TOOL_GXX64_LD_SYSMOD ?= $(TOOL_GXX64_PREFIX3)ld$(TOOL_GXX64_SUFFIX3)
     60else
     61 TOOL_GXX64_LD_SYSMOD ?= $(TOOL_GXX64_PREFIX2)ld$(TOOL_GXX64_SUFFIX2)
     62endif
    5563ifndef TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET)
    5664 TOOL_GXX64_LDFLAGS.dll ?= -shared
     
    7078 TOOL_GXX64_LD_SYSMOD_MAP ?=
    7179endif
    72 if1of ($(KBUILD_HOST), solaris)
    73  TOOL_GXX64_OBJCOPY ?= $(TOOL_GXX64_PREFIX)gobjcopy$(TOOL_GXX64_SUFFIX)
    74 else
    75  TOOL_GXX64_OBJCOPY ?= $(TOOL_GXX64_PREFIX)objcopy$(TOOL_GXX64_SUFFIX)
    76 endif
     80TOOL_GXX64_OBJCOPY ?= $(TOOL_GXX64_PREFIX2)objcopy$(TOOL_GXX64_SUFFIX2)
    7781
    7882ifdef SLKRUNS
  • trunk/kBuild/tools/LLVMGCC42MACHO.kmk

    r3392 r3393  
    4141 TOOL_LLVMGCC42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
    4242endif
     43TOOL_LLVMGCC42MACHO_PREFIX2   ?=
     44TOOL_LLVMGCC42MACHO_SUFFIX2   ?= $(HOSTSUFF_EXE)
    4345TOOL_LLVMGCC42MACHO_CC        ?= $(TOOL_LLVMGCC42MACHO_PREFIX)gcc$(TOOL_LLVMGCC42MACHO_SUFFIX)
    4446TOOL_LLVMGCC42MACHO_CXX       ?= $(TOOL_LLVMGCC42MACHO_PREFIX)g++$(TOOL_LLVMGCC42MACHO_SUFFIX)
     
    5254#TOOL_LLVMGCC42MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5355
    54 TOOL_LLVMGCC42MACHO_DSYMUTIL_PREFIX ?=
    55 TOOL_LLVMGCC42MACHO_DSYMUTIL_SUFFIX ?= $(HOSTSUFF_EXE)
    56 TOOL_LLVMGCC42MACHO_DSYMUTIL  ?= $(TOOL_LLVMGCC42MACHO_DSYMUTIL_PREFIX)dsymutil$(TOOL_LLVMGCC42MACHO_DSYMUTIL_SUFFIX)
     56TOOL_LLVMGCC42MACHO_AR        ?= $(TOOL_LLVMGCC42MACHO_PREFIX2)ar$(TOOL_LLVMGCC42MACHO_SUFFIX2)
     57TOOL_LLVMGCC42MACHO_DSYMUTIL  ?= $(TOOL_LLVMGCC42MACHO_PREFIX2)dsymutil$(TOOL_LLVMGCC42MACHO_SUFFIX2)
     58TOOL_LLVMGCC42MACHO_STRIP     ?= $(TOOL_LLVMGCC42MACHO_PREFIX2)strip$(TOOL_LLVMGCC42MACHO_SUFFIX2)
     59TOOL_LLVMGCC42MACHO_STRIP_PROGRAM ?= $(TOOL_LLVMGCC42MACHO_STRIP) -SXxru
     60TOOL_LLVMGCC42MACHO_STRIP_DLL     ?= $(TOOL_LLVMGCC42MACHO_STRIP) -Sxru
     61TOOL_LLVMGCC42MACHO_STRIP_SYSMOD  ?= $(TOOL_LLVMGCC42MACHO_STRIP) -Sru
     62
    5763
    5864ifdef SLKRUNS
     
    101107TOOL_LLVMGCC42MACHO_ASOBJSUFF        ?= .o
    102108
    103 TOOL_LLVMGCC42MACHO_AR               ?= ar$(HOSTSUFF_EXE)
    104109TOOL_LLVMGCC42MACHO_ARFLAGS          ?= -c -rs
    105110TOOL_LLVMGCC42MACHO_ARLIBSUFF        ?= .a
     
    108113TOOL_LLVMGCC42MACHO_LDFLAGS.debug    ?= -g
    109114TOOL_LLVMGCC42MACHO_LDFLAGS.profile  ?= -g
    110 
    111 TOOL_LLVMGCC42MACHO_STRIP_PROGRAM    ?= strip -SXxru
    112 TOOL_LLVMGCC42MACHO_STRIP_DLL        ?= strip -Sxru
    113 TOOL_LLVMGCC42MACHO_STRIP_SYSMOD     ?= strip -Sru
    114115
    115116
  • trunk/kBuild/tools/LLVMGXX42MACHO.kmk

    r3392 r3393  
    4141 TOOL_LLVMGXX42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
    4242endif
     43TOOL_LLVMGXX42MACHO_PREFIX2   ?=
     44TOOL_LLVMGXX42MACHO_SUFFIX2   ?= $(HOSTSUFF_EXE)
    4345TOOL_LLVMGXX42MACHO_CC        ?= $(TOOL_LLVMGXX42MACHO_PREFIX)gcc$(TOOL_LLVMGXX42MACHO_SUFFIX)
    4446TOOL_LLVMGXX42MACHO_CXX       ?= $(TOOL_LLVMGXX42MACHO_PREFIX)g++$(TOOL_LLVMGXX42MACHO_SUFFIX)
     
    5355#TOOL_LLVMGXX42MACHO_LD_SONAME = -Wl,-dylib_install_name $(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5456
    55 TOOL_LLVMGXX42MACHO_DSYMUTIL_PREFIX ?=
    56 TOOL_LLVMGXX42MACHO_DSYMUTIL_SUFFIX ?= $(HOSTSUFF_EXE)
    57 TOOL_LLVMGXX42MACHO_DSYMUTIL  ?= $(TOOL_LLVMGXX42MACHO_DSYMUTIL_PREFIX)dsymutil$(TOOL_LLVMGXX42MACHO_DSYMUTIL_SUFFIX)
     57TOOL_LLVMGXX42MACHO_AR        ?= $(TOOL_LLVMGXX42MACHO_PREFIX2)ar$(TOOL_LLVMGXX42MACHO_SUFFIX2)
     58TOOL_LLVMGXX42MACHO_DSYMUTIL  ?= $(TOOL_LLVMGXX42MACHO_PREFIX2)dsymutil$(TOOL_LLVMGXX42MACHO_SUFFIX2)
     59TOOL_LLVMGXX42MACHO_STRIP     ?= $(TOOL_LLVMGXX42MACHO_PREFIX2)strip$(TOOL_LLVMGXX42MACHO_SUFFIX2)
     60TOOL_LLVMGXX42MACHO_STRIP_PROGRAM ?= $(TOOL_LLVMGXX42MACHO_STRIP) -SXxru
     61TOOL_LLVMGXX42MACHO_STRIP_DLL     ?= $(TOOL_LLVMGXX42MACHO_STRIP) -Sxru
     62TOOL_LLVMGXX42MACHO_STRIP_SYSMOD  ?= $(TOOL_LLVMGXX42MACHO_STRIP) -Sru
    5863
    5964ifdef SLKRUNS
     
    110115TOOL_LLVMGXX42MACHO_ASOBJSUFF        ?= .o
    111116
    112 TOOL_LLVMGXX42MACHO_AR               ?= ar$(HOSTSUFF_EXE)
    113117TOOL_LLVMGXX42MACHO_ARFLAGS          ?= -c -rs
    114118TOOL_LLVMGXX42MACHO_ARLIBSUFF        ?= .a
     
    118122TOOL_LLVMGXX42MACHO_LDFLAGS.profile  ?= -g
    119123
    120 TOOL_LLVMGXX42MACHO_STRIP_PROGRAM    ?= strip -SXxru
    121 TOOL_LLVMGXX42MACHO_STRIP_DLL        ?= strip -Sxru
    122 TOOL_LLVMGXX42MACHO_STRIP_SYSMOD     ?= strip -Sru
    123124
    124125
  • trunk/kBuild/tools/XGCCAMD64LINUX.kmk

    r3121 r3393  
    3535
    3636# Tool Specific Properties
    37 TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE ?= $(HOSTSUFF_EXE)
     37TOOL_XGCCAMD64LINUX_SUFFIX ?= $(HOSTSUFF_EXE)
    3838ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),linux.amd64)
    3939 # not x-compile, use the default gcc.
     
    4848    ifeq ($(filter-out win.amd64,$(KBUILD_HOST).$(KBUILD_HOST_ARCH)),) # these can use the windows build.
    4949     TOOL_XGCCAMD64LINUX_EXEC_PREFIX ?= $(EXEC_X86_WIN32)
    50      TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE := .exe
     50     TOOL_XGCCAMD64LINUX_SUFFIX := .exe
    5151     PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(KBUILD_DEVTOOLS)/win.x86/x86_64-unknown-linux-gnu/*))
    5252     ifeq ($(PATH_TOOL_XGCCAMD64LINUX),)
     
    6868endif
    6969
    70 TOOL_XGCCAMD64LINUX_CC  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)gcc$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
    71 TOOL_XGCCAMD64LINUX_CXX ?= $(TOOL_XGCCAMD64LINUX_PREFIX)g++$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
    72 TOOL_XGCCAMD64LINUX_AS  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)gcc$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
    73 TOOL_XGCCAMD64LINUX_AR  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)ar$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
    74 TOOL_XGCCAMD64LINUX_LD  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)g++$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
    75 TOOL_XGCCAMD64LINUX_LD_SYSMOD ?= $(TOOL_XGCCAMD64LINUX_PREFIX)ld$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
     70TOOL_XGCCAMD64LINUX_PREFIX2 ?= $(TOOL_XGCCAMD64LINUX_PREFIX)
     71TOOL_XGCCAMD64LINUX_SUFFIX2 ?= $(TOOL_XGCCAMD64LINUX_SUFFIX)
     72TOOL_XGCCAMD64LINUX_CC  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)gcc$(TOOL_XGCCAMD64LINUX_SUFFIX)
     73TOOL_XGCCAMD64LINUX_CXX ?= $(TOOL_XGCCAMD64LINUX_PREFIX)g++$(TOOL_XGCCAMD64LINUX_SUFFIX)
     74TOOL_XGCCAMD64LINUX_AS  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)gcc$(TOOL_XGCCAMD64LINUX_SUFFIX)
     75TOOL_XGCCAMD64LINUX_AR  ?= $(TOOL_XGCCAMD64LINUX_PREFIX2)ar$(TOOL_XGCCAMD64LINUX_SUFFIX2)
     76TOOL_XGCCAMD64LINUX_LD  ?= $(TOOL_XGCCAMD64LINUX_PREFIX)g++$(TOOL_XGCCAMD64LINUX_SUFFIX)
     77TOOL_XGCCAMD64LINUX_LD_SYSMOD ?= $(TOOL_XGCCAMD64LINUX_PREFIX2)ld$(TOOL_XGCCAMD64LINUX_SUFFIX2)
    7678
    7779TOOL_XGCCAMD64LINUX_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette