Changeset 1504 for trunk/kBuild/tools


Ignore:
Timestamp:
Apr 9, 2008, 2:04:42 AM (17 years ago)
Author:
bird
Message:

Environment / global variable policy changes. Renamed the following but will continue to check for the old ones:
BUILD_TYPE -> KBUILD_TYPE
BUILD_TARGET -> KBUILD_TARGET
BUILD_TARGET_ARCH -> KBUILD_TARGET_ARCH
BUILD_TARGET_CPU -> KBUILD_TARGET_CPU
BUILD_PLATFORM -> KBUILD_HOST
BUILD_PLATFORM_ARCH -> KBUILD_HOST_ARCH
BUILD_PLATFORM_CPU -> KBUILD_HOST_CPU
PATH_KBUILD -> KBUILD_PATH
PATH_KBUILD_BIN -> KBUILD_BIN_PATH

Location:
trunk/kBuild/tools
Files:
19 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/GCC.kmk

    r1259 r1504  
    3636TOOL_GCC_LDFLAGS.dll.os2 ?= -Zdll
    3737TOOL_GCC_LDFLAGS.dll.darwin ?= -dynamiclib
    38 ifndef TOOL_GCC_LDFLAGS.$(BUILD_TARGET)
     38ifndef TOOL_GCC_LDFLAGS.$(KBUILD_TARGET)
    3939TOOL_GCC_LDFLAGS.dll ?= -shared
    4040else
    41 TOOL_GCC_LDFLAGS.dll ?= $(TOOL_GCC_LDFLAGS.$(BUILD_TARGET))
     41TOOL_GCC_LDFLAGS.dll ?= $(TOOL_GCC_LDFLAGS.$(KBUILD_TARGET))
    4242endif
    4343

  • trunk/kBuild/tools/GCC3.kmk

    r1418 r1504  
    3131TOOL_GCC3_CXX ?= g++$(HOSTSUFF_EXE)
    3232TOOL_GCC3_AS  ?= gcc$(HOSTSUFF_EXE)
    33 ifeq ($(BUILD_TARGET),solaris) ## @todo drop the MRI script!
     33ifeq ($(KBUILD_TARGET),solaris) ## @todo drop the MRI script!
    3434 TOOL_GCC3_AR ?= gar$(HOSTSUFF_EXE)
    3535else
    3636 TOOL_GCC3_AR ?= ar$(HOSTSUFF_EXE)
    3737endif
    38 ifeq ($(BUILD_TARGET),os2)
     38ifeq ($(KBUILD_TARGET),os2)
    3939 TOOL_GCC3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
    4040else
    … …  
    4343TOOL_GCC3_LD ?= gcc$(HOSTSUFF_EXE)
    4444TOOL_GCC3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    45 ifndef TOOL_GCC3_LDFLAGS.$(BUILD_TARGET)
     45ifndef TOOL_GCC3_LDFLAGS.$(KBUILD_TARGET)
    4646 TOOL_GCC3_LDFLAGS.dll ?= -shared
    4747else
    48  TOOL_GCC3_LDFLAGS.dll ?= $(TOOL_GCC3_LDFLAGS.$(BUILD_TARGET))
     48 TOOL_GCC3_LDFLAGS.dll ?= $(TOOL_GCC3_LDFLAGS.$(KBUILD_TARGET))
    4949endif
    5050TOOL_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)))
    52 ifeq ($(BUILD_TARGET),os2)
     51TOOL_GCC3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     52ifeq ($(KBUILD_TARGET),os2)
    5353 TOOL_GCC3_LD_MAP ?= -Zmap=$(1)
    5454 TOOL_GCC3_LD_SYSMOD_MAP ?= -Zmap=$(1)
    … …  
    274274define TOOL_GCC3_LINK_DLL_CMDS
    275275        $(QUIET)$(TOOL_GCC3_LD) $(TOOL_GCC3_LDFLAGS.dll) $(flags) -o $(out)\
    276                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(out)))\
     276                $(if $(filter-out win32 os2, $(KBUILD_TARGET)),$(call TOOL_GCC3_LD_SONAME,$(target),$(out)))\
    277277                $(objs)\
    278278                $(filter %.def, $(othersrc))\

  • trunk/kBuild/tools/GCC32.kmk

    r1418 r1504  
    3535TOOL_GCC32_LD  ?= gcc$(HOSTSUFF_EXE) -m32
    3636TOOL_GCC32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    37 ifndef TOOL_GCC32_LDFLAGS.$(BUILD_TARGET)
     37ifndef TOOL_GCC32_LDFLAGS.$(KBUILD_TARGET)
    3838TOOL_GCC32_LDFLAGS.dll ?= -shared
    3939else
    40 TOOL_GCC32_LDFLAGS.dll ?= $(TOOL_GCC32_LDFLAGS.$(BUILD_TARGET))
     40TOOL_GCC32_LDFLAGS.dll ?= $(TOOL_GCC32_LDFLAGS.$(KBUILD_TARGET))
    4141endif
    4242TOOL_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)))
    44 ifeq ($(BUILD_TARGET),os2)
     43TOOL_GCC32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     44ifeq ($(KBUILD_TARGET),os2)
    4545TOOL_GCC32_LD_MAP ?= -Zmap=$(1)
    4646else
    4747TOOL_GCC32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    4848endif
    49 ifeq ($(BUILD_TARGET),os2)
     49ifeq ($(KBUILD_TARGET),os2)
    5050TOOL_GCC32_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5151else
    … …  
    266266define TOOL_GCC32_LINK_DLL_CMDS
    267267        $(QUIET)$(TOOL_GCC32_LD) $(TOOL_GCC32_LDFLAGS.dll) $(flags) -o $(out)\
    268                 $(if $(filter-out win os2, $(BUILD_TARGET)),$(call TOOL_GCC32_LD_SONAME,$(target),$(out)))\
     268                $(if $(filter-out win os2, $(KBUILD_TARGET)),$(call TOOL_GCC32_LD_SONAME,$(target),$(out)))\
    269269                $(objs)\
    270270                $(foreach p,$(libpath), -L$(p))\

  • trunk/kBuild/tools/GCC3OMF.kmk

    r1418 r1504  
    3535TOOL_GCC3OMF_LD ?= gcc$(HOSTSUFF_EXE)
    3636TOOL_GCC3OMF_LD_SYSMOD ?= gcc$(HOSTSUFF_EXE)
    37 ifndef TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET)
     37ifndef TOOL_GCC3OMF_LDFLAGS.$(KBUILD_TARGET)
    3838TOOL_GCC3OMF_LDFLAGS.dll ?= -shared -Zdll
    3939else
    40 TOOL_GCC3OMF_LDFLAGS.dll ?= $(TOOL_GCC3OMF_LDFLAGS.$(BUILD_TARGET))
     40TOOL_GCC3OMF_LDFLAGS.dll ?= $(TOOL_GCC3OMF_LDFLAGS.$(KBUILD_TARGET))
    4141endif
    4242TOOL_GCC3OMF_LDFLAGS.sysmod ?= -nostdlib

  • trunk/kBuild/tools/GCC3PLAIN.kmk

    r1418 r1504  
    3838TOOL_GCC3PLAIN_LDFLAGS.dll.os2 ?= -Zdll
    3939TOOL_GCC3PLAIN_LDFLAGS.dll.darwin ?= -dynamiclib
    40 ifndef TOOL_GCC3PLAIN_LDFLAGS.$(BUILD_TARGET)
     40ifndef TOOL_GCC3PLAIN_LDFLAGS.$(KBUILD_TARGET)
    4141 TOOL_GCC3PLAIN_LDFLAGS.dll ?= -shared
    4242else
    43  TOOL_GCC3PLAIN_LDFLAGS.dll ?= $(TOOL_GCC3PLAIN_LDFLAGS.$(BUILD_TARGET))
     43 TOOL_GCC3PLAIN_LDFLAGS.dll ?= $(TOOL_GCC3PLAIN_LDFLAGS.$(KBUILD_TARGET))
    4444endif
    4545TOOL_GCC3PLAIN_LD_SONAME.darwin ?= $(NO_SUCH_VARIABLE)
    4646TOOL_GCC3PLAIN_LD_SONAME.os2 ?= $(NO_SUCH_VARIABLE)
    47 TOOL_GCC3PLAIN_LD_SONAME.solaris ?= -Wl,-h,$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     47TOOL_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)))
    4848TOOL_GCC3PLAIN_LD_SONAME.win ?= $(NO_SUCH_VARIABLE)
    49 ifndef TOOL_GCC3PLAIN_LD_SONAME.$(BUILD_TARGET)
    50  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)))
     49ifndef TOOL_GCC3PLAIN_LD_SONAME.$(KBUILD_TARGET)
     50 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)))
    5151else
    52  TOOL_GCC3PLAIN_LD_SONAME ?= $(TOOL_GCC3PLAIN_LD_SONAME.$(BUILD_TARGET))
     52 TOOL_GCC3PLAIN_LD_SONAME ?= $(TOOL_GCC3PLAIN_LD_SONAME.$(KBUILD_TARGET))
    5353endif
    5454ifdef SLKRUNS
    … …  
    269269define TOOL_GCC3PLAIN_LINK_DLL_CMDS
    270270        $(QUIET)$(TOOL_GCC3PLAIN_LD) $(TOOL_GCC3PLAIN_LDFLAGS.dll) $(flags) -o $(out)\
    271                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GCC3PLAIN_LD_SONAME,$(target),$(out)))\
     271                $(if $(filter-out win32 os2, $(KBUILD_TARGET)),$(call TOOL_GCC3PLAIN_LD_SONAME,$(target),$(out)))\
    272272                $(objs)\
    273273                $(filter %.def, $(othersrc))\

  • trunk/kBuild/tools/GCC4MACHO.kmk

    r1418 r1504  
    3434TOOL_GCC4MACHO_LD  ?= gcc$(HOSTSUFF_EXE)
    3535TOOL_GCC4MACHO_LD_SYSMOD ?= gcc$(HOSTSUFF_EXE)
    36 ifndef TOOL_GCC4MACHO_LDFLAGS.$(BUILD_TARGET)
     36ifndef TOOL_GCC4MACHO_LDFLAGS.$(KBUILD_TARGET)
    3737TOOL_GCC4MACHO_LDFLAGS.dll ?= -dynamiclib
    3838else
    39 TOOL_GCC4MACHO_LDFLAGS.dll ?= $(TOOL_GCC4MACHO_LDFLAGS.$(BUILD_TARGET))
     39TOOL_GCC4MACHO_LDFLAGS.dll ?= $(TOOL_GCC4MACHO_LDFLAGS.$(KBUILD_TARGET))
    4040endif
    4141TOOL_GCC4MACHO_LDFLAGS.sysmod ?= -r
    42 #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)))
     42#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)))
    4343
    4444ifdef SLKRUNS

  • trunk/kBuild/tools/GCC64.kmk

    r1418 r1504  
    3535TOOL_GCC64_LD  ?= gcc$(HOSTSUFF_EXE) -m64
    3636TOOL_GCC64_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    37 ifndef TOOL_GCC64_LDFLAGS.$(BUILD_TARGET)
     37ifndef TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET)
    3838TOOL_GCC64_LDFLAGS.dll ?= -shared
    3939else
    40 TOOL_GCC64_LDFLAGS.dll ?= $(TOOL_GCC64_LDFLAGS.$(BUILD_TARGET))
     40TOOL_GCC64_LDFLAGS.dll ?= $(TOOL_GCC64_LDFLAGS.$(KBUILD_TARGET))
    4141endif
    4242TOOL_GCC64_LDFLAGS.sysmod ?= -r -m elf_x86_64
    43 TOOL_GCC64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    44 ifeq ($(BUILD_TARGET),os2)
     43TOOL_GCC64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     44ifeq ($(KBUILD_TARGET),os2)
    4545TOOL_GCC64_LD_MAP ?= -Zmap=$(1)
    4646else
    4747TOOL_GCC64_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    4848endif
    49 ifeq ($(BUILD_TARGET),os2)
     49ifeq ($(KBUILD_TARGET),os2)
    5050TOOL_GCC64_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5151else
    … …  
    266266define TOOL_GCC64_LINK_DLL_CMDS
    267267        $(QUIET)$(TOOL_GCC64_LD) $(TOOL_GCC64_LDFLAGS.dll) $(flags) -o $(out)\
    268                 $(if $(filter-out win os2, $(BUILD_TARGET)),$(call TOOL_GCC64_LD_SONAME,$(target),$(out)))\
     268                $(if $(filter-out win os2, $(KBUILD_TARGET)),$(call TOOL_GCC64_LD_SONAME,$(target),$(out)))\
    269269                $(objs)\
    270270                $(foreach p,$(libpath), -L$(p))\

  • trunk/kBuild/tools/GXX.kmk

    r1259 r1504  
    3636TOOL_GXX_LDFLAGS.dll.os2 ?= -Zdll
    3737TOOL_GXX_LDFLAGS.dll.darwin ?= -dynamiclib
    38 ifndef TOOL_GXX_LDFLAGS.$(BUILD_TARGET)
     38ifndef TOOL_GXX_LDFLAGS.$(KBUILD_TARGET)
    3939TOOL_GXX_LDFLAGS.dll ?= -shared
    4040else
    41 TOOL_GXX_LDFLAGS.dll ?= $(TOOL_GXX_LDFLAGS.$(BUILD_TARGET))
     41TOOL_GXX_LDFLAGS.dll ?= $(TOOL_GXX_LDFLAGS.$(KBUILD_TARGET))
    4242endif
    4343

  • trunk/kBuild/tools/GXX3.kmk

    r1418 r1504  
    3131TOOL_GXX3_CXX ?= g++$(HOSTSUFF_EXE)
    3232TOOL_GXX3_AS  ?= gcc$(HOSTSUFF_EXE)
    33 ifeq ($(BUILD_TARGET),solaris)
     33ifeq ($(KBUILD_TARGET),solaris)
    3434 TOOL_GXX3_AR ?= gar$(HOSTSUFF_EXE)
    3535else
    3636 TOOL_GXX3_AR ?= ar$(HOSTSUFF_EXE)
    3737endif
    38 ifeq ($(BUILD_TARGET),os2)
     38ifeq ($(KBUILD_TARGET),os2)
    3939 TOOL_GXX3_AR_IMP ?= emximp$(HOSTSTUFF_EXE)
    4040else
    … …  
    4343TOOL_GXX3_LD ?= g++$(HOSTSUFF_EXE)
    4444TOOL_GXX3_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    45 ifndef TOOL_GXX3_LDFLAGS.$(BUILD_TARGET)
     45ifndef TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET)
    4646 TOOL_GXX3_LDFLAGS.dll ?= -shared
    4747else
    48  TOOL_GXX3_LDFLAGS.dll ?= $(TOOL_GXX3_LDFLAGS.$(BUILD_TARGET))
     48 TOOL_GXX3_LDFLAGS.dll ?= $(TOOL_GXX3_LDFLAGS.$(KBUILD_TARGET))
    4949endif
    5050TOOL_GXX3_LDFLAGS.sysmod ?= -r
    51 TOOL_GXX3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    52 ifeq ($(BUILD_TARGET),os2)
     51TOOL_GXX3_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     52ifeq ($(KBUILD_TARGET),os2)
    5353 TOOL_GXX3_LD_MAP ?= -Zmap=$(1)
    5454 TOOL_GXX3_LD_SYSMOD_MAP ?= -Zmap=$(1)
    … …  
    274274define TOOL_GXX3_LINK_DLL_CMDS
    275275        $(QUIET)$(TOOL_GXX3_LD) $(TOOL_GXX3_LDFLAGS.dll) $(flags) -o $(out)\
    276                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GXX3_LD_SONAME,$(target),$(out)))\
     276                $(if $(filter-out win32 os2, $(KBUILD_TARGET)),$(call TOOL_GXX3_LD_SONAME,$(target),$(out)))\
    277277                $(objs)\
    278278                $(filter %.def, $(othersrc))\

  • trunk/kBuild/tools/GXX32.kmk

    r1418 r1504  
    3535TOOL_GXX32_LD  ?= g++$(HOSTSUFF_EXE) -m32
    3636TOOL_GXX32_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    37 ifndef TOOL_GXX32_LDFLAGS.$(BUILD_TARGET)
     37ifndef TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET)
    3838TOOL_GXX32_LDFLAGS.dll ?= -shared
    3939else
    40 TOOL_GXX32_LDFLAGS.dll ?= $(TOOL_GXX32_LDFLAGS.$(BUILD_TARGET))
     40TOOL_GXX32_LDFLAGS.dll ?= $(TOOL_GXX32_LDFLAGS.$(KBUILD_TARGET))
    4141endif
    4242TOOL_GXX32_LDFLAGS.sysmod ?= -r -m elf_i386
    43 TOOL_GXX32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    44 ifeq ($(BUILD_TARGET),os2)
     43TOOL_GXX32_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     44ifeq ($(KBUILD_TARGET),os2)
    4545TOOL_GXX32_LD_MAP ?= -Zmap=$(1)
    4646else
    4747TOOL_GXX32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    4848endif
    49 ifeq ($(BUILD_TARGET),os2)
     49ifeq ($(KBUILD_TARGET),os2)
    5050TOOL_GXX32_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5151else
    … …  
    265265define TOOL_GXX32_LINK_DLL_CMDS
    266266        $(QUIET)$(TOOL_GXX32_LD) $(TOOL_GXX32_LDFLAGS.dll) $(flags) -o $(out)\
    267                 $(if $(filter-out win os2, $(BUILD_TARGET)),$(call TOOL_GXX32_LD_SONAME,$(target),$(out)))\
     267                $(if $(filter-out win os2, $(KBUILD_TARGET)),$(call TOOL_GXX32_LD_SONAME,$(target),$(out)))\
    268268                $(objs)\
    269269                $(foreach p,$(libpath), -L$(p))\

  • trunk/kBuild/tools/GXX3OMF.kmk

    r1418 r1504  
    3535TOOL_GXX3OMF_LD ?= g++$(HOSTSUFF_EXE)
    3636TOOL_GXX3OMF_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
    37 ifndef TOOL_GXX3OMF_LDFLAGS.$(BUILD_TARGET)
     37ifndef TOOL_GXX3OMF_LDFLAGS.$(KBUILD_TARGET)
    3838TOOL_GXX3OMF_LDFLAGS.dll ?= -shared -Zdll
    3939else
    40 TOOL_GXX3OMF_LDFLAGS.dll ?= $(TOOL_GXX3OMF_LDFLAGS.$(BUILD_TARGET))
     40TOOL_GXX3OMF_LDFLAGS.dll ?= $(TOOL_GXX3OMF_LDFLAGS.$(KBUILD_TARGET))
    4141endif
    4242TOOL_GXX3OMF_LDFLAGS.sysmod ?= -nostdlib

  • trunk/kBuild/tools/GXX3PLAIN.kmk

    r1418 r1504  
    3838TOOL_GXX3PLAIN_LDFLAGS.dll.os2 ?= -Zdll
    3939TOOL_GXX3PLAIN_LDFLAGS.dll.darwin ?= -dynamiclib
    40 ifndef TOOL_GXX3PLAIN_LDFLAGS.$(BUILD_TARGET)
     40ifndef TOOL_GXX3PLAIN_LDFLAGS.$(KBUILD_TARGET)
    4141 TOOL_GXX3PLAIN_LDFLAGS.dll ?= -shared
    4242else
    43  TOOL_GXX3PLAIN_LDFLAGS.dll ?= $(TOOL_GXX3PLAIN_LDFLAGS.$(BUILD_TARGET))
     43 TOOL_GXX3PLAIN_LDFLAGS.dll ?= $(TOOL_GXX3PLAIN_LDFLAGS.$(KBUILD_TARGET))
    4444endif
    4545TOOL_GXX3PLAIN_LD_SONAME.darwin ?= $(NO_SUCH_VARIABLE)
    4646TOOL_GXX3PLAIN_LD_SONAME.os2 ?= $(NO_SUCH_VARIABLE)
    47 TOOL_GXX3PLAIN_LD_SONAME.solaris ?= -Wl,-h,$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     47TOOL_GXX3PLAIN_LD_SONAME.solaris ?= -Wl,-h,$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    4848TOOL_GXX3PLAIN_LD_SONAME.win ?= $(NO_SUCH_VARIABLE)
    49 ifndef TOOL_GXX3PLAIN_LD_SONAME.$(BUILD_TARGET)
    50  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)))
     49ifndef TOOL_GXX3PLAIN_LD_SONAME.$(KBUILD_TARGET)
     50 TOOL_GXX3PLAIN_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    5151else
    52  TOOL_GXX3PLAIN_LD_SONAME ?= $(TOOL_GXX3PLAIN_LD_SONAME.$(BUILD_TARGET))
     52 TOOL_GXX3PLAIN_LD_SONAME ?= $(TOOL_GXX3PLAIN_LD_SONAME.$(KBUILD_TARGET))
    5353endif
    5454ifdef SLKRUNS
    … …  
    269269define TOOL_GXX3PLAIN_LINK_DLL_CMDS
    270270        $(QUIET)$(TOOL_GXX3PLAIN_LD) $(TOOL_GXX3PLAIN_LDFLAGS.dll) $(flags) -o $(out)\
    271                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_GXX3PLAIN_LD_SONAME,$(target),$(out)))\
     271                $(if $(filter-out win32 os2, $(KBUILD_TARGET)),$(call TOOL_GXX3PLAIN_LD_SONAME,$(target),$(out)))\
    272272                $(objs)\
    273273                $(filter %.def, $(othersrc))\

  • trunk/kBuild/tools/GXX4MACHO.kmk

    r1418 r1504  
    3434TOOL_GXX4MACHO_LD  ?= g++$(HOSTSUFF_EXE)
    3535TOOL_GXX4MACHO_LD_SYSMOD ?= g++$(HOSTSUFF_EXE)
    36 ifndef TOOL_GXX4MACHO_LDFLAGS.$(BUILD_TARGET)
     36ifndef TOOL_GXX4MACHO_LDFLAGS.$(KBUILD_TARGET)
    3737TOOL_GXX4MACHO_LDFLAGS.dll ?= -dynamiclib
    3838else
    39 TOOL_GXX4MACHO_LDFLAGS.dll ?= $(TOOL_GXX4MACHO_LDFLAGS.$(BUILD_TARGET))
     39TOOL_GXX4MACHO_LDFLAGS.dll ?= $(TOOL_GXX4MACHO_LDFLAGS.$(KBUILD_TARGET))
    4040endif
    4141TOOL_GXX4MACHO_LDFLAGS.sysmod ?= -r
    42 #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)))
     42#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)))
    4343
    4444ifdef SLKRUNS

  • trunk/kBuild/tools/GXX64.kmk

    r1418 r1504  
    3535TOOL_GXX64_LD  ?= g++$(HOSTSUFF_EXE) -m64
    3636TOOL_GXX64_LD_SYSMOD ?= ld$(HOSTSUFF_EXE)
    37 ifndef TOOL_GXX64_LDFLAGS.$(BUILD_TARGET)
     37ifndef TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET)
    3838TOOL_GXX64_LDFLAGS.dll ?= -shared
    3939else
    40 TOOL_GXX64_LDFLAGS.dll ?= $(TOOL_GXX64_LDFLAGS.$(BUILD_TARGET))
     40TOOL_GXX64_LDFLAGS.dll ?= $(TOOL_GXX64_LDFLAGS.$(KBUILD_TARGET))
    4141endif
    4242TOOL_GXX64_LDFLAGS.sysmod ?= -r -m elf_x86_64
    43 TOOL_GXX64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    44 ifeq ($(BUILD_TARGET),os2)
     43TOOL_GXX64_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     44ifeq ($(KBUILD_TARGET),os2)
    4545TOOL_GXX64_LD_MAP ?= -Zmap=$(1)
    4646else
    4747TOOL_GXX64_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    4848endif
    49 ifeq ($(BUILD_TARGET),os2)
     49ifeq ($(KBUILD_TARGET),os2)
    5050TOOL_GXX64_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5151else
    … …  
    265265define TOOL_GXX64_LINK_DLL_CMDS
    266266        $(QUIET)$(TOOL_GXX64_LD) $(TOOL_GXX64_LDFLAGS.dll) $(flags) -o $(out)\
    267                 $(if $(filter-out win os2, $(BUILD_TARGET)),$(call TOOL_GXX64_LD_SONAME,$(target),$(out)))\
     267                $(if $(filter-out win os2, $(KBUILD_TARGET)),$(call TOOL_GXX64_LD_SONAME,$(target),$(out)))\
    268268                $(objs)\
    269269                $(foreach p,$(libpath), -L$(p))\

  • trunk/kBuild/tools/MINGW32.kmk

    r1034 r1504  
    5252  TOOL_MINGW32_PREFIX :=
    5353 endif
    54  ifneq ($(BUILD_PLATFORM),win)
     54 ifneq ($(KBUILD_HOST),win)
    5555  # we're cross compiling either using an emulator (wine/odin) or a cross compiler.
    5656  ifneq ($(PATH_TOOL_MINGW32),$(subst /win.x86,,$(subst /x86.win,,$(PATH_TOOL_MINGW32))))

  • trunk/kBuild/tools/TAR.kmk

    r819 r1504  
    5555TOOL_TAR_UNPACK_DEPEND =
    5656TOOL_TAR_UNPACK_DEPORD =
    57 ifeq ($(BUILD_PLATFORM),win) # hacking with buggy unxutils on windows. it doesn't like driver letters.
     57ifeq ($(KBUILD_HOST),win) # hacking with buggy unxutils on windows. it doesn't like driver letters.
    5858define TOOL_TAR_UNPACK_CMDS
    5959        $(QUIET)$(TOOL_TAR_UNPACK) -x $(flags) -C $(subst G:,,$(inst)) -f $(archive)

  • trunk/kBuild/tools/VCC80.kmk

    r1354 r1504  
    22## @file
    33#
    4 # kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting $(BUILD_TARGET).
     4# kBuild Tool Config - Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting $(KBUILD_TARGET).
    55#
    66# Copyright (c) 2004-2007 knut st. osmundsen <fbird-kBuild-spam@anduin.net>
    … …  
    2525#
    2626
    27 TOOL_VCC80 := Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting $(BUILD_TARGET).
     27TOOL_VCC80 := Visual C++ 8.0 (aka Visual .NET 2005, or MSC v14), targeting $(KBUILD_TARGET).
    2828
    2929# Tool Specific Properties
    … …  
    4848endif
    4949ifneq ($(PATH_TOOL_VCC80),)
    50  ifeq ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH),win.amd64)
     50 ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.amd64)
    5151 PATH_TOOL_VCC80_BIN.amd64 ?= $(PATH_TOOL_VCC80)/bin/amd64
    5252 else
    … …  
    5454 endif
    5555 PATH_TOOL_VCC80_BIN.x86   ?= $(PATH_TOOL_VCC80)/bin
    56  PATH_TOOL_VCC80_BIN       ?= $(PATH_TOOL_VCC80_BIN.$(BUILD_TARGET))
     56 PATH_TOOL_VCC80_BIN       ?= $(PATH_TOOL_VCC80_BIN.$(KBUILD_TARGET))
    5757 PATH_TOOL_VCC80_LIB.amd64 ?= $(PATH_TOOL_VCC80)/lib/amd64
    5858 PATH_TOOL_VCC80_LIB.x86   ?= $(PATH_TOOL_VCC80)/lib
    59  PATH_TOOL_VCC80_LIB       ?= $(PATH_TOOL_VCC80_LIB.$(BUILD_TARGET))
     59 PATH_TOOL_VCC80_LIB       ?= $(PATH_TOOL_VCC80_LIB.$(KBUILD_TARGET))
    6060 PATH_TOOL_VCC80_INC       ?= $(PATH_TOOL_VCC80)/include
    6161 PATH_TOOL_VCC80_ATLMFC    ?= $(PATH_TOOL_VCC80X86)/atlmfc
    … …  
    6363 PATH_TOOL_VCC80_ATLMFC_LIB.amd64 ?= $(PATH_TOOL_VCC80_ATLMFC)/lib
    6464 PATH_TOOL_VCC80_ATLMFC_LIB.x86   ?= $(PATH_TOOL_VCC80_ATLMFC)/lib/amd64
    65  PATH_TOOL_VCC80_ATLMFC_LIB       ?= $(PATH_TOOL_VCC80_ATLMFC_LIB.$(BUILD_TARGET))
     65 PATH_TOOL_VCC80_ATLMFC_LIB       ?= $(PATH_TOOL_VCC80_ATLMFC_LIB.$(KBUILD_TARGET))
    6666 TOOL_VCC80_CC  ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/cl.exe
    6767 TOOL_VCC80_CXX ?= $(EXEC_X86_WIN32) $(PATH_TOOL_VCC80_BIN)/cl.exe

  • trunk/kBuild/tools/VCC80AMD64.kmk

    r1354 r1504  
    4949 PATH_TOOL_VCC80AMD64 := $(PATH_TOOL_VCC80AMD64)
    5050endif
    51 ifeq ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH),win.amd64)
     51ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),win.amd64)
    5252PATH_TOOL_VCC80AMD64_BIN ?= $(PATH_TOOL_VCC80AMD64)/bin/amd64
    5353else

  • trunk/kBuild/tools/XGCCAMD64LINUX.kmk

    r1355 r1504  
    2929# Tool Specific Properties
    3030TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE ?= $(HOSTSUFF_EXE)
    31 ifeq ($(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH),linux.amd64)
     31ifeq ($(KBUILD_HOST).$(KBUILD_HOST_ARCH),linux.amd64)
    3232 # not x-compile, use the default gcc.
    3333 TOOL_XGCCAMD64LINUX_PREFIX := $(TOOL_XGCCAMD64LINUX_PREFIX)
    … …  
    3939   PATH_TOOL_XGCCAMD64LINUX := $(sort $(wildcard $(PATH_DEVTOOLS_BLD)/x86_64-unknown-linux-gnu/*))
    4040   ifeq ($(PATH_TOOL_XGCCAMD64LINUX),)
    41     ifeq ($(filter-out win.amd64,$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)),) # these can use the windows build.
     41    ifeq ($(filter-out win.amd64,$(KBUILD_HOST).$(KBUILD_HOST_ARCH)),) # these can use the windows build.
    4242     TOOL_XGCCAMD64LINUX_EXEC_PREFIX ?= $(EXEC_X86_WIN32)
    4343     TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE := .exe
    … …  
    6868TOOL_XGCCAMD64LINUX_LD_SYSMOD ?= $(TOOL_XGCCAMD64LINUX_PREFIX)ld$(TOOL_XGCCAMD64LINUX_HOSTSUFF_EXE)
    6969
    70 TOOL_XGCCAMD64LINUX_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(BUILD_TARGET).$(BUILD_TYPE)) $($(1)_SONAME.$(BUILD_TARGET)) $($(1)_SONAME.$(BUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
     70TOOL_XGCCAMD64LINUX_LD_SONAME ?= -Wl,-soname=$(firstword $($(1)_SONAME.$(KBUILD_TARGET).$(KBUILD_TYPE)) $($(1)_SONAME.$(KBUILD_TARGET)) $($(1)_SONAME.$(KBUILD_TYPE)) $($(1)_SONAME) $(notdir $(2)))
    7171TOOL_XGCCAMD64LINUX_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    7272TOOL_XGCCAMD64LINUX_LD_SYSMOD_MAP ?= -Map $(1) --cref
    … …  
    247247define TOOL_XGCCAMD64LINUX_LINK_DLL_CMDS
    248248        $(QUIET)$(TOOL_XGCCAMD64LINUX_LD) $(TOOL_XGCCAMD64LINUX_LDFLAGS.dll) $(flags) -o $(out)\
    249                 $(if $(filter-out win32 os2, $(BUILD_TARGET)),$(call TOOL_XGCCAMD64LINUX_LD_SONAME,$(target),$(out)))\
     249                $(if $(filter-out win32 os2, $(KBUILD_TARGET)),$(call TOOL_XGCCAMD64LINUX_LD_SONAME,$(target),$(out)))\
    250250                $(objs)\
    251251                $(foreach p,$(libpath), -L$(p))\
Note: See TracChangeset for help on using the changeset viewer.