Changeset 3391


Ignore:
Timestamp:
Jun 30, 2020, 10:08:15 AM (5 years ago)
Author:
bird
Message:

tools/GXX*: Added _PREFIX/_SUFFIX properties to all g++ tools. Some minor fixes.

Location:
trunk/kBuild/tools
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/GXX.kmk

    r3257 r3391  
    3535
    3636# Tool Specific Properties
    37 TOOL_GXX_CC  ?= gcc$(HOSTSUFF_EXE)
    38 TOOL_GXX_CXX ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GXX_PCH ?= $(TOOL_GXX_CXX)
    40 TOOL_GXX_AS  ?= gcc$(HOSTSUFF_EXE)
    41 TOOL_GXX_AR  ?= ar$(HOSTSUFF_EXE)
    42 TOOL_GXX_RANLIB ?= ranlib$(HOSTSUFF_EXE)
    43 TOOL_GXX_LD  ?= g++$(HOSTSUFF_EXE)
    44 TOOL_GXX_LDFLAGS.dll.os2 ?= -Zdll
     37ifndef TOOL_GXX_PREFIX
     38 TOOL_GXX_PREFIX :=
     39endif
     40ifndef TOOL_GXX_SUFFIX
     41 TOOL_GXX_SUFFIX := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GXX_CC     ?= $(TOOL_GXX_PREFIX)gcc$(TOOL_GXX_SUFFIX)
     44TOOL_GXX_CXX    ?= $(TOOL_GXX_PREFIX)g++$(TOOL_GXX_SUFFIX)
     45TOOL_GXX_PCH    ?= $(TOOL_GXX_CXX)
     46TOOL_GXX_AS     ?= $(TOOL_GXX_PREFIX)gcc$(TOOL_GXX_SUFFIX)
     47TOOL_GXX_AR     ?= $(TOOL_GXX_PREFIX)ar$(TOOL_GXX_SUFFIX)
     48TOOL_GXX_RANLIB ?= $(TOOL_GXX_PREFIX)ranlib$(TOOL_GXX_SUFFIX)
     49TOOL_GXX_LD     ?= $(TOOL_GXX_PREFIX)g++$(TOOL_GXX_SUFFIX)
     50TOOL_GXX_LDFLAGS.dll.os2    ?= -Zdll
    4551TOOL_GXX_LDFLAGS.dll.darwin ?= -dynamiclib
    4652ifndef TOOL_GXX_LDFLAGS.$(KBUILD_TARGET)
    47 TOOL_GXX_LDFLAGS.dll ?= -shared
     53 TOOL_GXX_LDFLAGS.dll      ?= -shared
    4854else
    49 TOOL_GXX_LDFLAGS.dll ?= $(TOOL_GXX_LDFLAGS.$(KBUILD_TARGET))
     55 TOOL_GXX_LDFLAGS.dll      ?= $(TOOL_GXX_LDFLAGS.$(KBUILD_TARGET))
    5056endif
    5157

  • trunk/kBuild/tools/GXX3.kmk

    r3257 r3391  
    11# $Id$
    22## @file
    3 # kBuild Tool Config - Generic GCC v3.2.x using the system GCC and Binutils, for building C++ code.
     3# kBuild Tool Config - Generic GCC v3.2+ using the system GCC and Binutils, for building C++ code.
    44#
    55
    … …  
    3535
    3636# Tool Specific Properties
    37 TOOL_GXX3_CC  ?= gcc$(HOSTSUFF_EXE)
    38 TOOL_GXX3_CXX ?= g++$(HOSTSUFF_EXE)
     37ifndef TOOL_GXX3_PREFIX
     38 TOOL_GXX3_PREFIX :=
     39endif
     40ifndef TOOL_GXX3_SUFFIX
     41 TOOL_GXX3_SUFFIX := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GXX3_CC  ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
     44TOOL_GXX3_CXX ?= $(TOOL_GXX3_PREFIX)g++$(TOOL_GXX3_SUFFIX)
    3945TOOL_GXX3_PCH ?= $(TOOL_GXX3_CXX)
    40 TOOL_GXX3_AS  ?= gcc$(HOSTSUFF_EXE)
    41 ifeq ($(KBUILD_TARGET),solaris)
    42  TOOL_GXX3_AR ?= gar$(HOSTSUFF_EXE)
    43 else
    44  TOOL_GXX3_AR ?= ar$(HOSTSUFF_EXE)
     46TOOL_GXX3_AS  ?= $(TOOL_GXX3_PREFIX)gcc$(TOOL_GXX3_SUFFIX)
     47if1of ($(KBUILD_TARGET),solaris)
     48 TOOL_GXX3_AR ?= $(TOOL_GXX3_PREFIX)gar$(TOOL_GXX3_SUFFIX)
     49else
     50 TOOL_GXX3_AR ?= $(TOOL_GXX3_PREFIX)ar$(TOOL_GXX3_SUFFIX)
    4551endif
    4652ifeq ($(KBUILD_TARGET),os2)
    47  TOOL_GXX3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
    48 else
    49  TOOL_GXX3_AR_IMP ?= $(ECHO) not supported!
    50 endif
    51 TOOL_GXX3_LD ?= g++$(HOSTSUFF_EXE)
    52 TOOL_GXX3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
     53 TOOL_GXX3_AR_IMP   ?= $(TOOL_GXX3_PREFIX)emximp$(TOOL_GXX3_SUFFIX)
     54else
     55 TOOL_GXX3_AR_IMP   ?= $(ECHO) not supported!
     56endif
     57TOOL_GXX3_LD        ?= $(TOOL_GXX3_PREFIX)g++$(TOOL_GXX3_SUFFIX)
     58TOOL_GXX3_LD_SYSMOD ?= $(TOOL_GXX3_PREFIX)ld$(TOOL_GXX3_SUFFIX)
    5359ifndef TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET)
    54  TOOL_GXX3_LDFLAGS.dll ?= -shared
    55 else
    56  TOOL_GXX3_LDFLAGS.dll ?= $(TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET))
     60 TOOL_GXX3_LDFLAGS.dll   ?= -shared
     61else
     62 TOOL_GXX3_LDFLAGS.dll   ?= $(TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET))
    5763endif
    5864TOOL_GXX3_LDFLAGS.sysmod ?= -r
    59 TOOL_GXX3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     65TOOL_GXX3_LD_SONAME      ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    6066ifeq ($(KBUILD_TARGET),os2)
    61  TOOL_GXX3_LD_MAP ?= -Zmap=$(1)
     67 TOOL_GXX3_LD_MAP        ?= -Zmap=$(1)
    6268 TOOL_GXX3_LD_SYSMOD_MAP ?= -Zmap=$(1)
    6369else
    64  TOOL_GXX3_LD_MAP ?=
     70 TOOL_GXX3_LD_MAP        ?=
    6571 TOOL_GXX3_LD_SYSMOD_MAP ?=
    6672endif
    6773if1of ($(KBUILD_HOST), solaris)
    68  TOOL_GXX3_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
    69 else
    70  TOOL_GXX3_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
     74 TOOL_GXX3_OBJCOPY  ?= $(TOOL_GXX3_PREFIX)gobjcopy$(TOOL_GXX3_SUFFIX)
     75else
     76 TOOL_GXX3_OBJCOPY  ?= $(TOOL_GXX3_PREFIX)objcopy$(TOOL_GXX3_SUFFIX)
    7177endif
    7278

  • trunk/kBuild/tools/GXX32.kmk

    r3258 r3391  
    3636
    3737# Tool Specific Properties
    38 TOOL_GXX32_CC  ?= gcc$(HOSTSUFF_EXE) -m32
    39 TOOL_GXX32_CXX ?= g++$(HOSTSUFF_EXE) -m32
     38ifndef TOOL_GXX32_PREFIX
     39 TOOL_GXX32_PREFIX :=
     40endif
     41ifndef TOOL_GXX32_SUFFIX
     42 TOOL_GXX32_SUFFIX := $(HOSTSUFF_EXE)
     43endif
     44TOOL_GXX32_CC  ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
     45TOOL_GXX32_CXX ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
    4046TOOL_GXX32_PCH ?= $(TOOL_GXX32_CXX)
    41 TOOL_GXX32_AS  ?= gcc$(HOSTSUFF_EXE) -m32
    42 TOOL_GXX32_AR  ?= ar$(HOSTSUFF_EXE)
    43 TOOL_GXX32_LD  ?= g++$(HOSTSUFF_EXE) -m32
    44 TOOL_GXX32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
     47TOOL_GXX32_AS  ?= $(TOOL_GXX32_PREFIX)gcc$(TOOL_GXX32_SUFFIX) -m32
     48if1of ($(KBUILD_TARGET),solaris)
     49 TOOL_GXX32_AR ?= $(TOOL_GXX32_PREFIX)gar$(TOOL_GXX32_SUFFIX)
     50else
     51 TOOL_GXX32_AR ?= $(TOOL_GXX32_PREFIX)ar$(TOOL_GXX32_SUFFIX)
     52endif
     53TOOL_GXX32_LD  ?= $(TOOL_GXX32_PREFIX)g++$(TOOL_GXX32_SUFFIX) -m32
     54TOOL_GXX32_LD_SYSMOD ?= $(TOOL_GXX32_PREFIX)ld$(TOOL_GXX32_SUFFIX)
    4555ifndef TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET)
    46 TOOL_GXX32_LDFLAGS.dll ?= -shared
    47 else
    48 TOOL_GXX32_LDFLAGS.dll ?= $(TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET))
     56 TOOL_GXX32_LDFLAGS.dll ?= -shared
     57else
     58 TOOL_GXX32_LDFLAGS.dll ?= $(TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET))
    4959endif
    5060TOOL_GXX32_LDFLAGS.sysmod ?= -r -m elf_i386$(if-expr "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "gnukfbsd",_fbsd,)
    5161TOOL_GXX32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5262ifeq ($(KBUILD_TARGET),os2)
    53 TOOL_GXX32_LD_MAP ?= -Zmap=$(1)
    54 else
    55 TOOL_GXX32_LD_MAP ?=
     63 TOOL_GXX32_LD_MAP ?= -Zmap=$(1)
     64else
     65 TOOL_GXX32_LD_MAP ?=
    5666endif
    5767ifeq ($(KBUILD_TARGET),os2)
    58 TOOL_GXX32_LD_SYSMOD_MAP ?= -Zmap=$(1)
    59 else
    60 TOOL_GXX32_LD_SYSMOD_MAP ?=
     68 TOOL_GXX32_LD_SYSMOD_MAP ?= -Zmap=$(1)
     69else
     70 TOOL_GXX32_LD_SYSMOD_MAP ?=
    6171endif
    6272if1of ($(KBUILD_HOST), solaris)
    63  TOOL_GXX32_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
    64 else
    65  TOOL_GXX32_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
     73 TOOL_GXX32_OBJCOPY ?= $(TOOL_GXX32_PREFIX)gobjcopy$(TOOL_GXX32_SUFFIX)
     74else
     75 TOOL_GXX32_OBJCOPY ?= $(TOOL_GXX32_PREFIX)objcopy$(TOOL_GXX32_SUFFIX)
    6676endif
    6777

  • trunk/kBuild/tools/GXX3OMF.kmk

    r3258 r3391  
    3535
    3636# Tool Specific Properties
    37 TOOL_GXX3OMF_CC  ?= gcc$(HOSTSUFF_EXE)
    38 TOOL_GXX3OMF_CXX ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GXX3OMF_PCH ?= $(TOOL_GXX3OMF_CXX)
    40 TOOL_GXX3OMF_AS  ?= gcc$(HOSTSUFF_EXE)
    41 TOOL_GXX3OMF_AR  ?= emxomfar$(HOSTSUFF_EXE)
    42 TOOL_GXX3OMF_AR_IMP ?= emximp$(HOSTSUFF_EXE)
    43 TOOL_GXX3OMF_LD ?= g++$(HOSTSUFF_EXE)
    44 TOOL_GXX3OMF_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
     37ifndef TOOL_GXX3OMF_PREFIX
     38 TOOL_GXX3OMF_PREFIX :=
     39endif
     40ifndef TOOL_GXX3OMF_SUFFIX
     41 TOOL_GXX3OMF_SUFFIX := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GXX3OMF_CC        ?= $(TOOL_GXX3OMF_PREFIX)gcc$(TOOL_GXX3OMF_SUFFIX)
     44TOOL_GXX3OMF_CXX       ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
     45TOOL_GXX3OMF_PCH       ?= $(TOOL_GXX3OMF_CXX)
     46TOOL_GXX3OMF_AS        ?= $(TOOL_GXX3OMF_PREFIX)gcc$(TOOL_GXX3OMF_SUFFIX)
     47TOOL_GXX3OMF_AR        ?= $(TOOL_GXX3OMF_PREFIX)emxomfar$(TOOL_GXX3OMF_SUFFIX)
     48TOOL_GXX3OMF_AR_IMP    ?= $(TOOL_GXX3OMF_PREFIX)emximp$(TOOL_GXX3OMF_SUFFIX)
     49TOOL_GXX3OMF_LD        ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
     50TOOL_GXX3OMF_LD_SYSMOD ?= $(TOOL_GXX3OMF_PREFIX)g++$(TOOL_GXX3OMF_SUFFIX)
    4551ifndef TOOL_GXX3OMF_LDFLAGS.$(KBUILD_TARGET)
    46 TOOL_GXX3OMF_LDFLAGS.dll ?= -shared -Zdll
     52 TOOL_GXX3OMF_LDFLAGS.dll  ?= -shared -Zdll
    4753else
    48 TOOL_GXX3OMF_LDFLAGS.dll ?= $(TOOL_GXX3OMF_LDFLAGS.$(KBUILD_TARGET))
     54 TOOL_GXX3OMF_LDFLAGS.dll  ?= $(TOOL_GXX3OMF_LDFLAGS.$(KBUILD_TARGET))
    4955endif
    5056TOOL_GXX3OMF_LDFLAGS.sysmod ?= -nostdlib
    51 TOOL_GXX3OMF_LD_MAP ?= -Zmap=$(1)
    52 TOOL_GXX3OMF_LD_SYSMOD_MAP ?= -Zmap=$(1)
    53 TOOL_GXX3OMF_RC = rc$(HOSTSUFF_EXE)
     57TOOL_GXX3OMF_LD_MAP         ?= -Zmap=$(1)
     58TOOL_GXX3OMF_LD_SYSMOD_MAP  ?= -Zmap=$(1)
     59
     60TOOL_GXX3OMF_RC_PREFIX ?= $(TOOL_GXX3OMF_PREFIX)
     61TOOL_GXX3OMF_RC_SUFFIX ?= $(TOOL_GXX3OMF_SUFFIX)
     62TOOL_GXX3OMF_RC = $(TOOL_GXX3OMF_RC_PREFIX)rc$(TOOL_GXX3OMF_RC_SUFFIX)
    5463
    5564ifdef SLKRUNS
    56 TOOL_GXX3OMF_CC  += -fmessage-length=0
    57 TOOL_GXX3OMF_CXX += -fmessage-length=0
     65 TOOL_GXX3OMF_CC  += -fmessage-length=0
     66 TOOL_GXX3OMF_CXX += -fmessage-length=0
    5867endif
    5968

  • trunk/kBuild/tools/GXX3PLAIN.kmk

    r3258 r3391  
    3535
    3636# Tool Specific Properties
    37 TOOL_GXX3PLAIN_CC  ?= gcc$(HOSTSUFF_EXE)
    38 TOOL_GXX3PLAIN_CXX ?= g++$(HOSTSUFF_EXE)
    39 TOOL_GXX3PLAIN_PCH ?= $(TOOL_GXX3PLAIN_CXX)
    40 TOOL_GXX3PLAIN_AS  ?= gcc$(HOSTSUFF_EXE)
    41 TOOL_GXX3PLAIN_AR  ?= ar$(HOSTSUFF_EXE)
    42 TOOL_GXX3PLAIN_RANLIB ?= ranlib$(HOSTSUFF_EXE)
    43 TOOL_GXX3PLAIN_LD  ?= g++$(HOSTSUFF_EXE)
    44 TOOL_GXX3PLAIN_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    45 TOOL_GXX3PLAIN_LD_SYSMOD.os2 ?= g++$(HOSTSUFF_EXE)
     37ifndef TOOL_GXX3PLAIN_PREFIX
     38 TOOL_GXX3PLAIN_PREFIX :=
     39endif
     40ifndef TOOL_GXX3PLAIN_SUFFIX
     41 TOOL_GXX3PLAIN_SUFFIX := $(HOSTSUFF_EXE)
     42endif
     43TOOL_GXX3PLAIN_CC            ?= $(TOOL_GXX3PLAIN_PREFIX)gcc$(TOOL_GXX3PLAIN_SUFFIX)
     44TOOL_GXX3PLAIN_CXX           ?= $(TOOL_GXX3PLAIN_PREFIX)g++$(TOOL_GXX3PLAIN_SUFFIX)
     45TOOL_GXX3PLAIN_PCH           ?= $(TOOL_GXX3PLAIN_CXX)
     46TOOL_GXX3PLAIN_AS            ?= $(TOOL_GXX3PLAIN_PREFIX)gcc$(TOOL_GXX3PLAIN_SUFFIX)
     47TOOL_GXX3PLAIN_AR            ?= $(TOOL_GXX3PLAIN_PREFIX)ar$(TOOL_GXX3PLAIN_SUFFIX)
     48TOOL_GXX3PLAIN_RANLIB        ?= $(TOOL_GXX3PLAIN_PREFIX)ranlib$(TOOL_GXX3PLAIN_SUFFIX)
     49TOOL_GXX3PLAIN_LD            ?= $(TOOL_GXX3PLAIN_PREFIX)g++$(TOOL_GXX3PLAIN_SUFFIX)
     50TOOL_GXX3PLAIN_LD_SYSMOD     ?= $(TOOL_GXX3PLAIN_PREFIX)ld$(TOOL_GXX3PLAIN_SUFFIX)
     51TOOL_GXX3PLAIN_LD_SYSMOD.os2 ?= $(TOOL_GXX3PLAIN_PREFIX)g++$(TOOL_GXX3PLAIN_SUFFIX)
    4652TOOL_GXX3PLAIN_LDFLAGS.dll.os2 ?= -Zdll
    4753TOOL_GXX3PLAIN_LDFLAGS.dll.darwin ?= -dynamiclib

  • trunk/kBuild/tools/GXX42MACHO.kmk

    r3258 r3391  
    3535
    3636# Tool Specific Properties
    37 TOOL_GXX42MACHO_PREFIX    ?=
    38 TOOL_GXX42MACHO_SUFFIX    ?= -4.2$(HOSTSUFF_EXE)
     37ifndef TOOL_GXX42MACHO_PREFIX
     38 TOOL_GXX42MACHO_PREFIX   :=
     39endif
     40ifndef TOOL_GXX42MACHO_SUFFIX
     41 TOOL_GXX42MACHO_SUFFIX   := -4.2$(HOSTSUFF_EXE)
     42endif
    3943TOOL_GXX42MACHO_CC        ?= $(TOOL_GXX42MACHO_PREFIX)gcc$(TOOL_GXX42MACHO_SUFFIX)
    4044TOOL_GXX42MACHO_CXX       ?= $(TOOL_GXX42MACHO_PREFIX)g++$(TOOL_GXX42MACHO_SUFFIX)
    41 TOOL_GXX42MACHO_PCH ?= $(TOOL_GXX42MACHO_CXX)
     45TOOL_GXX42MACHO_PCH       ?= $(TOOL_GXX42MACHO_CXX)
    4246TOOL_GXX42MACHO_OBJC      ?= $(TOOL_GXX42MACHO_PREFIX)gcc$(TOOL_GXX42MACHO_SUFFIX)
    4347TOOL_GXX42MACHO_OBJCXX    ?= $(TOOL_GXX42MACHO_PREFIX)gcc$(TOOL_GXX42MACHO_SUFFIX)
    … …  
    4549TOOL_GXX42MACHO_LD        ?= $(TOOL_GXX42MACHO_PREFIX)g++$(TOOL_GXX42MACHO_SUFFIX)
    4650TOOL_GXX42MACHO_LD_SYSMOD ?= $(TOOL_GXX42MACHO_PREFIX)g++$(TOOL_GXX42MACHO_SUFFIX)
    47 ifndef TOOL_GXX42MACHO_LDFLAGS.$(KBUILD_TARGET)
    4851TOOL_GXX42MACHO_LDFLAGS.dll ?= -dynamiclib
    49 else
    50 TOOL_GXX42MACHO_LDFLAGS.dll ?= $(TOOL_GXX42MACHO_LDFLAGS.$(KBUILD_TARGET))
    51 endif
    5252TOOL_GXX42MACHO_LDFLAGS.sysmod ?= -r
    5353#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  ?= dsymutil
     54TOOL_GXX42MACHO_DSYMUTIL_PREFIX ?=
     55TOOL_GXX42MACHO_DSYMUTIL_SUFFIX ?= $(HOSTSUFF_EXE)
     56TOOL_GXX42MACHO_DSYMUTIL  ?= $(TOOL_GXX42MACHO_DSYMUTIL_PREFIX)dsymutil$(TOOL_GXX42MACHO_DSYMUTIL_SUFFIX)
    5557
    5658ifdef SLKRUNS

  • trunk/kBuild/tools/GXX4MACHO.kmk

    r3258 r3391  
    3535
    3636# Tool Specific Properties
    37 TOOL_GXX4MACHO_PREFIX    ?=
    38 TOOL_GXX4MACHO_SUFFIX    ?= $(HOSTSUFF_EXE)
     37ifndef TOOL_GXX4MACHO_PREFIX
     38 TOOL_GXX4MACHO_PREFIX   :=
     39endif
     40ifndef TOOL_GXX4MACHO_SUFFIX
     41 TOOL_GXX4MACHO_SUFFIX   := $(HOSTSUFF_EXE)
     42endif
    3943TOOL_GXX4MACHO_CC        ?= $(TOOL_GXX4MACHO_PREFIX)gcc$(TOOL_GXX4MACHO_SUFFIX)
    4044TOOL_GXX4MACHO_CXX       ?= $(TOOL_GXX4MACHO_PREFIX)g++$(TOOL_GXX4MACHO_SUFFIX)
    41 TOOL_GXX4MACHO_PCH ?= $(TOOL_GXX4MACHO_CXX)
     45TOOL_GXX4MACHO_PCH       ?= $(TOOL_GXX4MACHO_CXX)
    4246TOOL_GXX4MACHO_OBJC      ?= $(TOOL_GXX4MACHO_PREFIX)gcc$(TOOL_GXX4MACHO_SUFFIX)
    4347TOOL_GXX4MACHO_OBJCXX    ?= $(TOOL_GXX4MACHO_PREFIX)gcc$(TOOL_GXX4MACHO_SUFFIX)
    … …  
    4549TOOL_GXX4MACHO_LD        ?= $(TOOL_GXX4MACHO_PREFIX)g++$(TOOL_GXX4MACHO_SUFFIX)
    4650TOOL_GXX4MACHO_LD_SYSMOD ?= $(TOOL_GXX4MACHO_PREFIX)g++$(TOOL_GXX4MACHO_SUFFIX)
    47 ifndef TOOL_GXX4MACHO_LDFLAGS.$(KBUILD_TARGET)
    4851TOOL_GXX4MACHO_LDFLAGS.dll ?= -dynamiclib
    49 else
    50 TOOL_GXX4MACHO_LDFLAGS.dll ?= $(TOOL_GXX4MACHO_LDFLAGS.$(KBUILD_TARGET))
    51 endif
    5252TOOL_GXX4MACHO_LDFLAGS.sysmod ?= -r
    5353#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  ?= dsymutil
     54TOOL_GXX4MACHO_DSYMUTIL_PREFIX ?=
     55TOOL_GXX4MACHO_DSYMUTIL_SUFFIX ?= $(HOSTSUFF_EXE)
     56TOOL_GXX4MACHO_DSYMUTIL  ?= $(TOOL_GXX4MACHO_DSYMUTIL_PREFIX)dsymutil$(TOOL_GXX4MACHO_DSYMUTIL_SUFFIX)
    5557
    5658ifdef SLKRUNS

  • trunk/kBuild/tools/GXX64.kmk

    r3258 r3391  
    3636
    3737# Tool Specific Properties
    38 TOOL_GXX64_CC  ?= gcc$(HOSTSUFF_EXE) -m64
    39 TOOL_GXX64_CXX ?= g++$(HOSTSUFF_EXE) -m64
     38ifndef TOOL_GXX64_PREFIX
     39 TOOL_GXX64_PREFIX :=
     40endif
     41ifndef TOOL_GXX64_SUFFIX
     42 TOOL_GXX64_SUFFIX := $(HOSTSUFF_EXE)
     43endif
     44TOOL_GXX64_CC  ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
     45TOOL_GXX64_CXX ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
    4046TOOL_GXX64_PCH ?= $(TOOL_GXX64_CXX)
    41 TOOL_GXX64_AS  ?= gcc$(HOSTSUFF_EXE) -m64
    42 TOOL_GXX64_AR  ?= ar$(HOSTSUFF_EXE)
    43 TOOL_GXX64_LD  ?= g++$(HOSTSUFF_EXE) -m64
    44 TOOL_GXX64_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
     47TOOL_GXX64_AS  ?= $(TOOL_GXX64_PREFIX)gcc$(TOOL_GXX64_SUFFIX) -m64
     48if1of ($(KBUILD_HOST), solaris)
     49 TOOL_GXX64_AR ?= $(TOOL_GXX64_PREFIX)gar$(TOOL_GXX64_SUFFIX)
     50else
     51 TOOL_GXX64_AR ?= $(TOOL_GXX64_PREFIX)ar$(TOOL_GXX64_SUFFIX)
     52endif
     53TOOL_GXX64_LD  ?= $(TOOL_GXX64_PREFIX)g++$(TOOL_GXX64_SUFFIX) -m64
     54TOOL_GXX64_LD_SYSMOD ?= $(TOOL_GXX64_PREFIX)ld$(TOOL_GXX64_SUFFIX)
    4555ifndef TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET)
    46 TOOL_GXX64_LDFLAGS.dll ?= -shared
    47 else
    48 TOOL_GXX64_LDFLAGS.dll ?= $(TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET))
     56 TOOL_GXX64_LDFLAGS.dll ?= -shared
     57else
     58 TOOL_GXX64_LDFLAGS.dll ?= $(TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET))
    4959endif
    5060TOOL_GXX64_LDFLAGS.sysmod ?= -r -m elf_x86_64$(if-expr "$(KBUILD_TARGET)" == "freebsd" || "$(KBUILD_TARGET)" == "gnukfbsd",_fbsd,)
    5161TOOL_GXX64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5262ifeq ($(KBUILD_TARGET),os2)
    53 TOOL_GXX64_LD_MAP ?= -Zmap=$(1)
    54 else
    55 TOOL_GXX64_LD_MAP ?=
     63 TOOL_GXX64_LD_MAP ?= -Zmap=$(1)
     64else
     65 TOOL_GXX64_LD_MAP ?=
    5666endif
    5767ifeq ($(KBUILD_TARGET),os2)
    58 TOOL_GXX64_LD_SYSMOD_MAP ?= -Zmap=$(1)
    59 else
    60 TOOL_GXX64_LD_SYSMOD_MAP ?=
     68 TOOL_GXX64_LD_SYSMOD_MAP ?= -Zmap=$(1)
     69else
     70 TOOL_GXX64_LD_SYSMOD_MAP ?=
    6171endif
    6272if1of ($(KBUILD_HOST), solaris)
    63  TOOL_GXX64_OBJCOPY ?= gobjcopy$(HOSTSUFF_EXE)
    64 else
    65  TOOL_GXX64_OBJCOPY ?= objcopy$(HOSTSUFF_EXE)
     73 TOOL_GXX64_OBJCOPY ?= $(TOOL_GXX64_PREFIX)gobjcopy$(TOOL_GXX64_SUFFIX)
     74else
     75 TOOL_GXX64_OBJCOPY ?= $(TOOL_GXX64_PREFIX)objcopy$(TOOL_GXX64_SUFFIX)
    6676endif
    6777
Note: See TracChangeset for help on using the changeset viewer.