VirtualBox

Changeset 1504 in kBuild


Ignore:
Timestamp:
Apr 9, 2008 12: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
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/footer.kmk

    r1502 r1504  
    44# kBuild - File included at top of makefile.
    55#
    6 # Copyright (c) 2004-2007 knut st. osmundsen <[email protected]>
     6# Copyright (c) 2004-2008 knut st. osmundsen <[email protected]>
    77#
    88#
    … …  
    4040
    4141# All targets of each types.
    42 _ALL_BLDPROGS    := $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH))    $(BLDPROGS.$(BUILD_PLATFORM_ARCH))  $(BLDPROGS.$(BUILD_PLATFORM_CPU))   $(BLDPROGS.$(BUILD_TYPE))
    43 _ALL_LIBRARIES   := $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET))     $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))       $(LIBRARIES.$(BUILD_TARGET_ARCH))   $(LIBRARIES.$(BUILD_TARGET_CPU))    $(LIBRARIES.$(BUILD_TYPE))
    44 _ALL_IMPORT_LIBS := $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET))   $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))     $(IMPORT_LIBS.$(BUILD_TARGET_ARCH)) $(IMPORT_LIBS.$(BUILD_TARGET_CPU))  $(IMPORT_LIBS.$(BUILD_TYPE))
    45 _ALL_DLLS        := $(DLLS)        $(DLLS.$(BUILD_TARGET))          $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))            $(DLLS.$(BUILD_TARGET_ARCH))        $(DLLS.$(BUILD_TARGET_CPU))         $(DLLS.$(BUILD_TYPE))
    46 _ALL_PROGRAMS    := $(PROGRAMS)    $(PROGRAMS.$(BUILD_TARGET))      $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))        $(PROGRAMS.$(BUILD_TARGET_ARCH))    $(PROGRAMS.$(BUILD_TARGET_CPU))     $(PROGRAMS.$(BUILD_TYPE))
    47 _ALL_SYSMODS     := $(SYSMODS)     $(SYSMODS.$(BUILD_TARGET))       $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))         $(SYSMODS.$(BUILD_TARGET_ARCH))     $(SYSMODS.$(BUILD_TARGET_CPU))      $(SYSMODS.$(BUILD_TYPE))
    48 _ALL_OTHERS      := $(OTHERS)      $(OTHERS.$(BUILD_TARGET))        $(OTHERS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))          $(OTHERS.$(BUILD_TARGET_ARCH))      $(OTHERS.$(BUILD_TARGET_CPU))       $(OTHERS.$(BUILD_TYPE))
    49 _ALL_INSTALLS    := $(INSTALLS)    $(INSTALLS.$(BUILD_TARGET))      $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))        $(INSTALLS.$(BUILD_TARGET_ARCH))    $(INSTALLS.$(BUILD_TARGET_CPU))     $(INSTALLS.$(BUILD_TYPE))
    50 _ALL_FETCHES     := $(FETCHES)     $(FETCHES.$(BUILD_TARGET))       $(FETCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))         $(FETCHES.$(BUILD_TARGET_ARCH))     $(FETCHES.$(BUILD_TARGET_CPU))      $(FETCHES.$(BUILD_TYPE))
    51 _ALL_PATCHES     := $(PATCHES)     $(PATCHES.$(BUILD_TARGET))       $(PATCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))         $(PATCHES.$(BUILD_TARGET_ARCH))     $(PATCHES.$(BUILD_TARGET_CPU))      $(PATCHES.$(BUILD_TYPE))
     42_ALL_BLDPROGS    := $(BLDPROGS)    $(BLDPROGS.$(KBUILD_HOST))        $(BLDPROGS.$(KBUILD_HOST).$(KBUILD_HOST_ARCH))            $(BLDPROGS.$(KBUILD_HOST_ARCH))      $(BLDPROGS.$(KBUILD_HOST_CPU))       $(BLDPROGS.$(KBUILD_TYPE))
     43_ALL_LIBRARIES   := $(LIBRARIES)   $(LIBRARIES.$(KBUILD_TARGET))     $(LIBRARIES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))       $(LIBRARIES.$(KBUILD_TARGET_ARCH))   $(LIBRARIES.$(KBUILD_TARGET_CPU))    $(LIBRARIES.$(KBUILD_TYPE))
     44_ALL_IMPORT_LIBS := $(IMPORT_LIBS) $(IMPORT_LIBS.$(KBUILD_TARGET))   $(IMPORT_LIBS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))     $(IMPORT_LIBS.$(KBUILD_TARGET_ARCH)) $(IMPORT_LIBS.$(KBUILD_TARGET_CPU))  $(IMPORT_LIBS.$(KBUILD_TYPE))
     45_ALL_DLLS        := $(DLLS)        $(DLLS.$(KBUILD_TARGET))          $(DLLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))            $(DLLS.$(KBUILD_TARGET_ARCH))        $(DLLS.$(KBUILD_TARGET_CPU))         $(DLLS.$(KBUILD_TYPE))
     46_ALL_PROGRAMS    := $(PROGRAMS)    $(PROGRAMS.$(KBUILD_TARGET))      $(PROGRAMS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))        $(PROGRAMS.$(KBUILD_TARGET_ARCH))    $(PROGRAMS.$(KBUILD_TARGET_CPU))     $(PROGRAMS.$(KBUILD_TYPE))
     47_ALL_SYSMODS     := $(SYSMODS)     $(SYSMODS.$(KBUILD_TARGET))       $(SYSMODS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))         $(SYSMODS.$(KBUILD_TARGET_ARCH))     $(SYSMODS.$(KBUILD_TARGET_CPU))      $(SYSMODS.$(KBUILD_TYPE))
     48_ALL_OTHERS      := $(OTHERS)      $(OTHERS.$(KBUILD_TARGET))        $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))          $(OTHERS.$(KBUILD_TARGET_ARCH))      $(OTHERS.$(KBUILD_TARGET_CPU))       $(OTHERS.$(KBUILD_TYPE))
     49_ALL_INSTALLS    := $(INSTALLS)    $(INSTALLS.$(KBUILD_TARGET))      $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))        $(INSTALLS.$(KBUILD_TARGET_ARCH))    $(INSTALLS.$(KBUILD_TARGET_CPU))     $(INSTALLS.$(KBUILD_TYPE))
     50_ALL_FETCHES     := $(FETCHES)     $(FETCHES.$(KBUILD_TARGET))       $(FETCHES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))         $(FETCHES.$(KBUILD_TARGET_ARCH))     $(FETCHES.$(KBUILD_TARGET_CPU))      $(FETCHES.$(KBUILD_TYPE))
     51_ALL_PATCHES     := $(PATCHES)     $(PATCHES.$(KBUILD_TARGET))       $(PATCHES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))         $(PATCHES.$(KBUILD_TARGET_ARCH))     $(PATCHES.$(KBUILD_TARGET_CPU))      $(PATCHES.$(KBUILD_TYPE))
    5252
    5353# all targets.
    … …  
    6464        $(_ALL_OTHERS)
    6565
    66 # all $(BUILD_TARGET) targets.
    67 _ALL_BUILD_TARGET_TARGETS = \
     66# all $(KBUILD_TARGET) targets.
     67_ALL_TARGET_TARGETS = \
    6868        $(_ALL_FETCHES) \
    6969        $(_ALL_PATCHES) \
    … …  
    7676        $(_ALL_OTHERS)
    7777
    78 # all $(BUILD_PLATFORM) targets.
    79 _ALL_BUILD_PLATFORM_TARGETS = \
     78# all $(KBUILD_HOST) targets.
     79_ALL_HOST_TARGETS = \
    8080        $(_ALL_BLDPROGS)
    8181
    … …  
    628628define def_templates_load_function
    629629ifndef TEMPLATE_$(loading)
    630  TEMPLATE_$(loading)_KMK_FILE := $(firstword $(foreach path, $(KBUILD_TEMPLATE_PATHS) $(PATH_KBUILD)/templates $(KBUILD_DEFAULT_PATHS), $(wildcard $(path)/$(loading).kmk)))
     630 TEMPLATE_$(loading)_KMK_FILE := $(firstword $(foreach path, $(KBUILD_TEMPLATE_PATHS) $(KBUILD_PATH)/templates $(KBUILD_DEFAULT_PATHS), $(wildcard $(path)/$(loading).kmk)))
    631631 ifeq ($(TEMPLATE_$(loading)_KMK_FILE),)
    632   $(error kBuild: Cannot find include file for the template '$(loading)'! Searched: $(KBUILD_TEMPLATE_PATHS) $(PATH_KBUILD)/templates $(KBUILD_DEFAULT_PATHS))
     632  $(error kBuild: Cannot find include file for the template '$(loading)'! Searched: $(KBUILD_TEMPLATE_PATHS) $(KBUILD_PATH)/templates $(KBUILD_DEFAULT_PATHS))
    633633 endif
    634634 include $(TEMPLATE_$(loading)_KMK_FILE)
    … …  
    649649# might not be 100% accurate... :-/
    650650#
    651 _BLD_TYPES   := $(BUILD_TYPE)
    652 _BLD_TARGETS := $(BUILD_TARGET) $(BUILD_PLATFORMS)
    653 _BLD_ARCHES  := $(BUILD_TARGET_ARCH) $(BUILD_PLATFORM_ARCH)
    654 _BLD_CPUS    := $(BUILD_TARGET_CPU) $(BUILD_PLATFORM_CPU)
     651_BLD_TYPES   := $(KBUILD_TYPE)
     652_BLD_TARGETS := $(KBUILD_TARGET) $(KBUILD_HOSTS)
     653_BLD_ARCHES  := $(KBUILD_TARGET_ARCH) $(KBUILD_HOST_ARCH)
     654_BLD_CPUS    := $(KBUILD_TARGET_CPU) $(KBUILD_HOST_CPU)
    655655
    656656define def_collect_bld_xyz
    … …  
    819819properties_now_r    := $(PROPS_LIBRARIES_ACCUMULATE_R)
    820820properties_deferred := $(PROPS_LIBRARIES_DEFERRED)
    821 if1of ($(BUILD_TARGET), nt os2 win)
     821if1of ($(KBUILD_TARGET), nt os2 win)
    822822 $(foreach trg, $(_ALL_LIBRARIES) $(_ALL_IMPORT_LIBS),$(evalval def_inherit))
    823823else
    … …  
    830830properties_now_r    := $(PROPS_DLLS_ACCUMULATE_R)
    831831properties_deferred := $(PROPS_DLLS_DEFERRED)
    832 if1of ($(BUILD_TARGET), nt os2 win)
     832if1of ($(KBUILD_TARGET), nt os2 win)
    833833 $(foreach trg, $(_ALL_DLLS),$(evalval def_inherit))
    834834else
    … …  
    979979$(target)_$(prop) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop))
    980980endif
    981 ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE)
    982 $(target)_$(prop).$(BUILD_TYPE) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
     981ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(KBUILD_TYPE)
     982$(target)_$(prop).$(KBUILD_TYPE) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(KBUILD_TYPE))
    983983endif
    984984ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)
    … …  
    10031003$(target)_$(prop) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop))
    10041004endif
    1005 ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE)
    1006 $(target)_$(prop).$(BUILD_TYPE) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
     1005ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(KBUILD_TYPE)
     1006$(target)_$(prop).$(KBUILD_TYPE) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(KBUILD_TYPE))
    10071007endif
    10081008ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)
    … …  
    10461046
    10471047# Inherit template properties
    1048 bld_trg := $(BUILD_TARGET)
    1049 bld_trg_arch := $(BUILD_TARGET_ARCH)
    1050 bld_trg_cpu := $(BUILD_TARGET_CPU)
    1051 $(foreach target, $(_ALL_BUILD_TARGET_TARGETS),$(evalval def_inherit_template))
    1052 
    1053 bld_trg := $(BUILD_PLATFORM)
    1054 bld_trg_arch := $(BUILD_PLATFORM_ARCH)
    1055 bld_trg_cpu := $(BUILD_PLATFORM_CPU)
    1056 $(foreach target, $(_ALL_BUILD_PLATFORM_TARGETS),$(evalval def_inherit_template))
     1048bld_trg := $(KBUILD_TARGET)
     1049bld_trg_arch := $(KBUILD_TARGET_ARCH)
     1050bld_trg_cpu := $(KBUILD_TARGET_CPU)
     1051$(foreach target, $(_ALL_TARGET_TARGETS),$(evalval def_inherit_template))
     1052
     1053bld_trg := $(KBUILD_HOST)
     1054bld_trg_arch := $(KBUILD_HOST_ARCH)
     1055bld_trg_cpu := $(KBUILD_HOST_CPU)
     1056$(foreach target, $(_ALL_HOST_TARGETS),$(evalval def_inherit_template))
    10571057
    10581058ifdef KBUILD_PROFILE_SELF
    … …  
    10701070# that should be included.
    10711071#
    1072 _TOOLS := $(TOOL.$(BUILD_TARGET))   $(TOOL.$(BUILD_TARGET_ARCH))   $(TOOL.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
    1073           $(TOOL.$(BUILD_PLATFORM)) $(TOOL.$(BUILD_PLATFORM_ARCH)) $(TOOL.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
     1072_TOOLS := $(TOOL.$(KBUILD_TARGET))   $(TOOL.$(KBUILD_TARGET_ARCH))   $(TOOL.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
     1073          $(TOOL.$(KBUILD_HOST)) $(TOOL.$(KBUILD_HOST_ARCH)) $(TOOL.$(KBUILD_HOST).$(KBUILD_HOST_ARCH)) \
    10741074          $(TOOL)
    1075 _SDKS  := $(SDKS.$(BUILD_TARGET))   $(SDKS.$(BUILD_TARGET_ARCH))   $(SDKS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
    1076           $(SDKS.$(BUILD_PLATFORM)) $(SDKS.$(BUILD_PLATFORM_ARCH)) $(SDKS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
    1077           $(SDKS.$(BUILD_TYPE)) \
     1075_SDKS  := $(SDKS.$(KBUILD_TARGET))   $(SDKS.$(KBUILD_TARGET_ARCH))   $(SDKS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) \
     1076          $(SDKS.$(KBUILD_HOST)) $(SDKS.$(KBUILD_HOST_ARCH)) $(SDKS.$(KBUILD_HOST).$(KBUILD_HOST_ARCH)) \
     1077          $(SDKS.$(KBUILD_TYPE)) \
    10781078          $(SDKS)
    10791079define def_tools_sdks_target_source
    … …  
    10941094        $($(source)_SDKS.$(_bld_trg_arch)) \
    10951095        $($(target)_$(source)_SDKS.$(_bld_trg_arch)) \
    1096         $($(source)_SDKS.$(BUILD_TYPE)) \
    1097         $($(target)_$(source)_SDKS.$(BUILD_TYPE)) \
     1096        $($(source)_SDKS.$(KBUILD_TYPE)) \
     1097        $($(target)_$(source)_SDKS.$(KBUILD_TYPE)) \
    10981098        $($(source)_SDKS) \
    10991099        $($(target)_$(source)_SDKS))
    … …  
    11011101
    11021102define def_tools_sdks_target
    1103 local _bld_type := $(firstword $($(target)_BLD_TYPE) $(BUILD_TYPE))
     1103local _bld_type := $(firstword $($(target)_BLD_TYPE) $(KBUILD_TYPE))
    11041104local _bld_trg := $(firstword $($(target)_BLD_TRG) $(bld_trg))
    11051105local _bld_trg_arch := $(firstword $($(target)_BLD_TRG_ARCH) $(bld_trg_arch))
    … …  
    11271127
    11281128define def_tools_srcname_target
    1129 local _bld_type := $(firstword $($(target)_BLD_TYPE) $(BUILD_TYPE))
     1129local _bld_type := $(firstword $($(target)_BLD_TYPE) $(KBUILD_TYPE))
    11301130local _bld_trg := $(firstword $($(target)_BLD_TRG) $(bld_trg))
    11311131local _bld_trg_arch := $(firstword $($(target)_BLD_TRG_ARCH) $(bld_trg_arch))
    … …  
    11421142endef # def_tools_srcname_target
    11431143
    1144 bld_trg := $(BUILD_TARGET)
    1145 bld_trg_arch := $(BUILD_TARGET_ARCH)
    1146 bld_trg_cpu := $(BUILD_TARGET_CPU)
    1147 $(foreach target, $(_ALL_BUILD_TARGET_TARGETS), $(evalval def_tools_sdks_target))
     1144bld_trg := $(KBUILD_TARGET)
     1145bld_trg_arch := $(KBUILD_TARGET_ARCH)
     1146bld_trg_cpu := $(KBUILD_TARGET_CPU)
     1147$(foreach target, $(_ALL_TARGET_TARGETS), $(evalval def_tools_sdks_target))
    11481148$(foreach target, $(_ALL_SRCNAME_TARGETS), $(evalval def_tools_srcname_target))
    11491149
    1150 bld_trg := $(BUILD_PLATFORM)
    1151 bld_trg_arch := $(BUILD_PLATFORM_ARCH)
    1152 bld_trg_cpu := $(BUILD_PLATFORM_CPU)
    1153 $(foreach target, $(_ALL_BUILD_PLATFORM_TARGETS), $(evalval def_tools_sdks_target))
     1150bld_trg := $(KBUILD_HOST)
     1151bld_trg_arch := $(KBUILD_HOST_ARCH)
     1152bld_trg_cpu := $(KBUILD_HOST_CPU)
     1153$(foreach target, $(_ALL_HOST_TARGETS), $(evalval def_tools_sdks_target))
    11541154
    11551155_TOOLS := $(sort $(_TOOLS))
    … …  
    11601160define def_tools_load_function
    11611161ifndef TOOL_$(loading)
    1162  TOOL_$(loading)_KMK_FILE := $(firstword $(foreach path, $(KBUILD_TOOL_PATHS) $(PATH_KBUILD)/tools $(KBUILD_DEFAULT_PATHS), $(wildcard $(path)/$(loading).kmk)))
     1162 TOOL_$(loading)_KMK_FILE := $(firstword $(foreach path, $(KBUILD_TOOL_PATHS) $(KBUILD_PATH)/tools $(KBUILD_DEFAULT_PATHS), $(wildcard $(path)/$(loading).kmk)))
    11631163 ifeq ($(TOOL_$(loading)_KMK_FILE),)
    1164   $(error kBuild: Cannot find include file for the tool '$(loading)'! Searched: $(KBUILD_TOOL_PATHS) $(PATH_KBUILD)/tools $(KBUILD_DEFAULT_PATHS))
     1164  $(error kBuild: Cannot find include file for the tool '$(loading)'! Searched: $(KBUILD_TOOL_PATHS) $(KBUILD_PATH)/tools $(KBUILD_DEFAULT_PATHS))
    11651165 endif
    11661166 include $(TOOL_$(loading)_KMK_FILE)
    … …  
    11751175define def_sdk_load_function
    11761176ifndef SDK_$(loading)
    1177  SDK_$(loading)_KMK_FILE := $(firstword $(foreach path, $(KBUILD_SDK_PATHS) $(PATH_KBUILD)/sdks $(KBUILD_DEFAULT_PATHS), $(wildcard $(path)/$(loading).kmk)))
     1177 SDK_$(loading)_KMK_FILE := $(firstword $(foreach path, $(KBUILD_SDK_PATHS) $(KBUILD_PATH)/sdks $(KBUILD_DEFAULT_PATHS), $(wildcard $(path)/$(loading).kmk)))
    11781178 ifeq ($(SDK_$(loading)_KMK_FILE),)
    1179   $(error kBuild: Cannot find include file for the SDK '$(loading)'! Searched: $(KBUILD_SDK_PATHS) $(PATH_KBUILD)/sdks $(KBUILD_DEFAULT_PATHS))
     1179  $(error kBuild: Cannot find include file for the SDK '$(loading)'! Searched: $(KBUILD_SDK_PATHS) $(KBUILD_PATH)/sdks $(KBUILD_DEFAULT_PATHS))
    11801180 endif
    11811181 include $(SDK_$(loading)_KMK_FILE)
    … …  
    12441244define def_pass1_link_common
    12451245
    1246 local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(BUILD_TYPE))
     1246local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(KBUILD_TYPE))
    12471247local bld_trg     := $(firstword $($(target)_BLD_TRG)      $(BUILD_$(bld_trg_base_var)))
    12481248local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(BUILD_$(bld_trg_base_var)_ARCH))
    … …  
    13121312tool_prefix := LD
    13131313bld_trg_base_var := PLATFORM
    1314 $(foreach target, $(BLDPROGS) $(BLDPROGS.$(BUILD_PLATFORM)) $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)), \
     1314$(foreach target, $(BLDPROGS) $(BLDPROGS.$(KBUILD_HOST)) $(BLDPROGS.$(KBUILD_HOST).$(KBUILD_HOST_ARCH)), \
    13151315        $(evalval def_pass1_bldprog))
    13161316
    … …  
    13241324tool_prefix := AR
    13251325bld_trg_base_var := TARGET
    1326 $(foreach target, $(LIBRARIES) $(LIBRARIES.$(BUILD_TARGET)) $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1326$(foreach target, $(LIBRARIES) $(LIBRARIES.$(KBUILD_TARGET)) $(LIBRARIES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    13271327        $(evalval def_pass1_link_common))
    13281328
    … …  
    13361336tool_prefix := LD
    13371337bld_trg_base_var := TARGET
    1338 $(foreach target, $(DLLS) $(DLLS.$(BUILD_TARGET)) $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1338$(foreach target, $(DLLS) $(DLLS.$(KBUILD_TARGET)) $(DLLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    13391339        $(evalval def_pass1_link_common))
    13401340
    … …  
    13461346#   - On other platforms they are fake DLLs.
    13471347#
    1348 if1of ($(BUILD_TARGET), nt os2 win win64 win32)
     1348if1of ($(KBUILD_TARGET), nt os2 win win64 win32)
    13491349 EXT     := LIB
    13501350 EXTPRE  :=
    … …  
    13521352 tool_prefix := AR
    13531353 bld_trg_base_var := TARGET
    1354  $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1354 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(KBUILD_TARGET)) $(IMPORT_LIBS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    13551355        $(evalval def_pass1_link_common))
    13561356else
    … …  
    13601360 tool_prefix := LD
    13611361 bld_trg_base_var := TARGET
    1362  $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1362 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(KBUILD_TARGET)) $(IMPORT_LIBS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    13631363        $(evalval def_pass1_link_common))
    13641364endif
    … …  
    13731373tool_prefix := LD
    13741374bld_trg_base_var := TARGET
    1375 $(foreach target, $(PROGRAMS) $(PROGRAMS.$(BUILD_TARGET)) $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1375$(foreach target, $(PROGRAMS) $(PROGRAMS.$(KBUILD_TARGET)) $(PROGRAMS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    13761376        $(evalval def_pass1_link_common))
    13771377
    … …  
    13851385tool_prefix := LD
    13861386bld_trg_base_var := TARGET
    1387 $(foreach target, $(SYSMODS) $(SYSMODS.$(BUILD_TARGET)) $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1387$(foreach target, $(SYSMODS) $(SYSMODS.$(KBUILD_TARGET)) $(SYSMODS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    13881388        $(evalval def_pass1_link_common))
    13891389
    … …  
    13941394#
    13951395define def_pass1_install
    1396 local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(BUILD_TYPE))
    1397 local bld_trg     := $(firstword $($(target)_BLD_TRG)      $(BUILD_TARGET))
    1398 local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(BUILD_TARGET_ARCH))
    1399 local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(BUILD_TARGET_CPU))
     1396local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(KBUILD_TYPE))
     1397local bld_trg     := $(firstword $($(target)_BLD_TRG)      $(KBUILD_TARGET))
     1398local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(KBUILD_TARGET_ARCH))
     1399local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(KBUILD_TARGET_CPU))
    14001400# TARGET_*
    14011401TARGET_$(target) := $(PATH_TARGET)/$(target).ins
    14021402# INSTARGET_ later.
    14031403endef
    1404 $(foreach target, $(INSTALLS) $(INSTALLS.$(BUILD_TARGET)) $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1404$(foreach target, $(INSTALLS) $(INSTALLS.$(KBUILD_TARGET)) $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    14051405        $(evalval def_pass1_install))
    14061406
    … …  
    17611761
    17621762# The 'sources'.
    1763 #$ (warning dbg fetch: target=$(target) sources=$($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TYPE)) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_TARGET_ARCH)) $($(target)_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)))
    1764 $(foreach source,$($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TYPE)) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_TARGET_ARCH)) $($(target)_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),\
     1763#$ (warning dbg fetch: target=$(target) sources=$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(KBUILD_TARGET)) $($(target)_SOURCES.$(KBUILD_TARGET_ARCH)) $($(target)_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)))
     1764$(foreach source,$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(KBUILD_TARGET)) $($(target)_SOURCES.$(KBUILD_TARGET_ARCH)) $($(target)_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),\
    17651765        $(evalval def_fetch_src))
    17661766
    … …  
    17861786
    17871787# Walk the FETCH target lists.
    1788 bld_trg := $(BUILD_TARGET)
    1789 bld_trg_arch := $(BUILD_TARGET_ARCH)
    1790 $(foreach target, $(FETCHES) $(FETCHES.$(BUILD_TARGET)) $(FETCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1788bld_trg := $(KBUILD_TARGET)
     1789bld_trg_arch := $(KBUILD_TARGET_ARCH)
     1790$(foreach target, $(FETCHES) $(FETCHES.$(KBUILD_TARGET)) $(FETCHES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    17911791        $(evalval def_fetch))
    17921792
    … …  
    18181818#define def_patch
    18191819#
    1820 #$(foreach source,$($(target)_SOURCES) $($(target)_SOURCES.$(BUILD_TYPE)) $($(target)_SOURCES.$(BUILD_TARGET)) $($(target)_SOURCES.$(BUILD_TARGET_ARCH)) $($(target)_SOURCES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),\
     1820#$(foreach source,$($(target)_SOURCES) $($(target)_SOURCES.$(KBUILD_TYPE)) $($(target)_SOURCES.$(KBUILD_TARGET)) $($(target)_SOURCES.$(KBUILD_TARGET_ARCH)) $($(target)_SOURCES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),\
    18211821#       $(evalval def_patch_src))
    18221822#
    … …  
    18241824#endef
    18251825#
    1826 #$(foreach target, $(PATCHES) $(PATCHES.$(BUILD_TARGET)) $(PATCHES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     1826#$(foreach target, $(PATCHES) $(PATCHES.$(KBUILD_TARGET)) $(PATCHES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    18271827#       $(evalval def_patch))
    18281828#
    … …  
    20522052# library basics
    20532053## @todo prefix
    2054 local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(BUILD_TYPE))
    2055 local bld_trg     := $(firstword $($(target)_BLD_TRG)      $(BUILD_TARGET))
    2056 local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(BUILD_TARGET_ARCH))
    2057 local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(BUILD_TARGET_CPU))
     2054local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(KBUILD_TYPE))
     2055local bld_trg     := $(firstword $($(target)_BLD_TRG)      $(KBUILD_TARGET))
     2056local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(KBUILD_TARGET_ARCH))
     2057local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(KBUILD_TARGET_CPU))
    20582058local tool        := $(call _TARGET_TOOL,$(target),AR)
    20592059ifeq ($(tool),)
    … …  
    22422242tool_do := LINK_LIBRARY
    22432243mode := 0644
    2244 $(foreach target, $(LIBRARIES) $(LIBRARIES.$(BUILD_TARGET)) $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(evalval def_lib))
     2244$(foreach target, $(LIBRARIES) $(LIBRARIES.$(KBUILD_TARGET)) $(LIBRARIES.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), $(evalval def_lib))
    22452245
    22462246ifdef KBUILD_PROFILE_SELF
    … …  
    22652265define def_link_common
    22662266# basics
    2267 local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(BUILD_TYPE))
     2267local bld_type    := $(firstword $($(target)_BLD_TYPE)     $(KBUILD_TYPE))
    22682268local bld_trg     := $(firstword $($(target)_BLD_TRG)      $(BUILD_$(bld_trg_base_var)))
    22692269local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(BUILD_$(bld_trg_base_var)_ARCH))
    … …  
    26082608mode    := 0755
    26092609bld_trg_base_var := PLATFORM
    2610 $(foreach target, $(BLDPROGS) $(BLDPROGS.$(BUILD_PLATFORM)) $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)), $(evalval def_bldprog))
     2610$(foreach target, $(BLDPROGS) $(BLDPROGS.$(KBUILD_HOST)) $(BLDPROGS.$(KBUILD_HOST).$(KBUILD_HOST_ARCH)), $(evalval def_bldprog))
    26112611
    26122612ifdef KBUILD_PROFILE_SELF
    … …  
    26302630mode    := 0644
    26312631bld_trg_base_var := TARGET
    2632 $(foreach target, $(DLLS) $(DLLS.$(BUILD_TARGET)) $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(evalval def_link_common))
     2632$(foreach target, $(DLLS) $(DLLS.$(KBUILD_TARGET)) $(DLLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), $(evalval def_link_common))
    26332633
    26342634ifdef KBUILD_PROFILE_SELF
    … …  
    26502650mode    := 0644
    26512651bld_trg_base_var := TARGET
    2652 ifeq ($(filter-out nt os2 win win64 win32,$(BUILD_TARGET)),)
     2652ifeq ($(filter-out nt os2 win win64 win32,$(KBUILD_TARGET)),)
    26532653 EXT     := LIB
    26542654 tool_do := LINK_LIBRARY
    26552655 definst := $(PATH_LIB)
    2656  $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(evalval def_lib))
     2656 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(KBUILD_TARGET)) $(IMPORT_LIBS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), $(evalval def_lib))
    26572657else
    26582658 EXT     := DLL
    26592659 tool_do := LINK_DLL
    26602660 definst := $(PATH_DLL)
    2661  $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(evalval def_link_common))
     2661 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(KBUILD_TARGET)) $(IMPORT_LIBS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), $(evalval def_link_common))
    26622662endif
    26632663
    … …  
    26822682mode    := 0755
    26832683bld_trg_base_var := TARGET
    2684 $(foreach target, $(PROGRAMS) $(PROGRAMS.$(BUILD_TARGET)) $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(evalval def_link_common))
     2684$(foreach target, $(PROGRAMS) $(PROGRAMS.$(KBUILD_TARGET)) $(PROGRAMS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), $(evalval def_link_common))
    26852685
    26862686ifdef KBUILD_PROFILE_SELF
    … …  
    27042704mode    := 0644
    27052705bld_trg_base_var := TARGET
    2706 $(foreach target, $(SYSMODS) $(SYSMODS.$(BUILD_TARGET)) $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(evalval def_link_common))
     2706$(foreach target, $(SYSMODS) $(SYSMODS.$(KBUILD_TARGET)) $(SYSMODS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), $(evalval def_link_common))
    27072707
    27082708ifdef KBUILD_PROFILE_SELF
    … …  
    27172717# OTHERS
    27182718#
    2719 _OTHERS = $(OTHERS) $(OTHERS.$(BUILD_TARGET)) $(OTHERS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
     2719_OTHERS = $(OTHERS) $(OTHERS.$(KBUILD_TARGET)) $(OTHERS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    27202720
    27212721
    … …  
    29842984define def_install
    29852985# the basics.
    2986 local bld_type  := $(firstword $($(target)_BLD_TYPE)     $(BUILD_TYPE))
    2987 local bld_trg   := $(firstword $($(target)_BLD_TRG)      $(BUILD_TARGET))
    2988 local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(BUILD_TARGET_ARCH))
    2989 local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(BUILD_TARGET_CPU))
     2986local bld_type  := $(firstword $($(target)_BLD_TYPE)     $(KBUILD_TYPE))
     2987local bld_trg   := $(firstword $($(target)_BLD_TRG)      $(KBUILD_TARGET))
     2988local bld_trg_arch:= $(firstword $($(target)_BLD_TRG_ARCH) $(KBUILD_TARGET_ARCH))
     2989local bld_trg_cpu := $(firstword $($(target)_BLD_TRG_CPU)  $(KBUILD_TARGET_CPU))
    29902990
    29912991INSTARGET_$(target) := $($(target)_GOALS)
    … …  
    30163016
    30173017## process all install targets
    3018 $(foreach target, $(INSTALLS) $(INSTALLS.$(BUILD_TARGET)) $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
     3018$(foreach target, $(INSTALLS) $(INSTALLS.$(KBUILD_TARGET)) $(INSTALLS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)), \
    30193019        $(evalval def_install))
    30203020
    … …  
    30303030# PACKING
    30313031#
    3032 _PACKING += $(PACKING) $(PACKING.$(BUILD_TARGET)) $(PACKING.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
     3032_PACKING += $(PACKING) $(PACKING.$(KBUILD_TARGET)) $(PACKING.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))
    30333033
    30343034
    … …  
    31103110# @param        $(PASS)         Uppercase pass name.
    31113111define def_pass_old
    3112 $(eval SUBDIRS_$(PASS)          ?= $(SUBDIRS)          $(SUBDIRS.$(BUILD_TARGET))           $(SUBDIRS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))          )
    3113 $(eval SUBDIRS_AFTER_$(PASS)    ?= $(SUBDIRS_AFTER)    $(SUBDIRS_AFTER.$(BUILD_TARGET))     $(SUBDIRS_AFTER.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))    )
    3114 $(eval MAKEFILES_BEFORE_$(PASS) ?= $(MAKEFILES_BEFORE) $(MAKEFILES_BEFORE.$(BUILD_TARGET))  $(MAKEFILES_BEFORE.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) )
    3115 $(eval MAKEFILES_AFTER_$(PASS)  ?= $(MAKEFILES_AFTER)  $(MAKEFILES_AFTER.$(BUILD_TARGET))   $(MAKEFILES_AFTER.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))  )
     3112$(eval SUBDIRS_$(PASS)          ?= $(SUBDIRS)          $(SUBDIRS.$(KBUILD_TARGET))           $(SUBDIRS.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))          )
     3113$(eval SUBDIRS_AFTER_$(PASS)    ?= $(SUBDIRS_AFTER)    $(SUBDIRS_AFTER.$(KBUILD_TARGET))     $(SUBDIRS_AFTER.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    )
     3114$(eval MAKEFILES_BEFORE_$(PASS) ?= $(MAKEFILES_BEFORE) $(MAKEFILES_BEFORE.$(KBUILD_TARGET))  $(MAKEFILES_BEFORE.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) )
     3115$(eval MAKEFILES_AFTER_$(PASS)  ?= $(MAKEFILES_AFTER)  $(MAKEFILES_AFTER.$(KBUILD_TARGET))   $(MAKEFILES_AFTER.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))  )
    31163116
    31173117$(eval tag:=_before)
    31183118$(eval dep:=)
    3119 $(foreach subdir,$(SUBDIRS_$(PASS))            $(SUBDIRS_$(PASS).$(BUILD_TARGET))           $(SUBDIRS_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH))         ,$(eval $(def_pass_subdir)))
    3120 $(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET))  $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),$(eval $(def_pass_makefile)))
     3119$(foreach subdir,$(SUBDIRS_$(PASS))            $(SUBDIRS_$(PASS).$(KBUILD_TARGET))           $(SUBDIRS_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))         ,$(eval $(def_pass_subdir)))
     3120$(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(KBUILD_TARGET))  $(MAKEFILES_BEFORE_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),$(eval $(def_pass_makefile)))
    31213121
    31223122$(eval tag:=_after)
    31233123$(eval dep:=pass_$(pass)_doit)
    3124 $(foreach subdir,$(SUBDIRS_AFTER_$(PASS))      $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET))     $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH))   ,$(eval $(def_pass_subdir)))
    3125 $(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET))   $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) ,$(eval $(def_pass_makefile)))
     3124$(foreach subdir,$(SUBDIRS_AFTER_$(PASS))      $(SUBDIRS_AFTER_$(PASS).$(KBUILD_TARGET))     $(SUBDIRS_AFTER_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))   ,$(eval $(def_pass_subdir)))
     3125$(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(KBUILD_TARGET))   $(MAKEFILES_AFTER_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) ,$(eval $(def_pass_makefile)))
    31263126
    31273127.NOTPARALLEL: pass_$(pass)_before pass_$(pass)_after
    … …  
    31363136
    31373137define def_pass
    3138 $(eval SUBDIRS_$(PASS)          ?= $(SUBDIRS)          $(SUBDIRS.$(BUILD_TARGET))          $(SUBDIRS.$(BUILD_TARGET.$(BUILD_TARGET_ARCH)))          )
    3139 $(eval SUBDIRS_AFTER_$(PASS)    ?= $(SUBDIRS_AFTER)    $(SUBDIRS_AFTER.$(BUILD_TARGET))    $(SUBDIRS_AFTER.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))    )
    3140 $(eval MAKEFILES_BEFORE_$(PASS) ?= $(MAKEFILES_BEFORE) $(MAKEFILES_BEFORE.$(BUILD_TARGET)) $(MAKEFILES_BEFORE.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) )
    3141 $(eval MAKEFILES_AFTER_$(PASS)  ?= $(MAKEFILES_AFTER)  $(MAKEFILES_AFTER.$(BUILD_TARGET))  $(MAKEFILES_AFTER.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))  )
     3138$(eval SUBDIRS_$(PASS)          ?= $(SUBDIRS)          $(SUBDIRS.$(KBUILD_TARGET))          $(SUBDIRS.$(KBUILD_TARGET.$(KBUILD_TARGET_ARCH)))          )
     3139$(eval SUBDIRS_AFTER_$(PASS)    ?= $(SUBDIRS_AFTER)    $(SUBDIRS_AFTER.$(KBUILD_TARGET))    $(SUBDIRS_AFTER.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))    )
     3140$(eval MAKEFILES_BEFORE_$(PASS) ?= $(MAKEFILES_BEFORE) $(MAKEFILES_BEFORE.$(KBUILD_TARGET)) $(MAKEFILES_BEFORE.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) )
     3141$(eval MAKEFILES_AFTER_$(PASS)  ?= $(MAKEFILES_AFTER)  $(MAKEFILES_AFTER.$(KBUILD_TARGET))  $(MAKEFILES_AFTER.$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))  )
    31423142
    31433143$(eval tag:=_before)
    31443144$(eval dep:=)
    3145 $(foreach subdir,$(SUBDIRS_$(PASS))            $(SUBDIRS_$(PASS).$(BUILD_TARGET))          $(SUBDIRS_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH))         ,$(eval $(def_pass_subdir)))
    3146 $(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET)) $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),$(eval $(def_pass_makefile)))
     3145$(foreach subdir,$(SUBDIRS_$(PASS))            $(SUBDIRS_$(PASS).$(KBUILD_TARGET))          $(SUBDIRS_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))         ,$(eval $(def_pass_subdir)))
     3146$(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(KBUILD_TARGET)) $(MAKEFILES_BEFORE_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)),$(eval $(def_pass_makefile)))
    31473147
    31483148$(eval tag:=_after)
    31493149$(eval dep:=pass_$(pass)_doit)
    3150 $(foreach subdir,$(SUBDIRS_AFTER_$(PASS))      $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET))    $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH))   ,$(eval $(def_pass_subdir)))
    3151 $(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET))  $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) ,$(eval $(def_pass_makefile)))
     3150$(foreach subdir,$(SUBDIRS_AFTER_$(PASS))      $(SUBDIRS_AFTER_$(PASS).$(KBUILD_TARGET))    $(SUBDIRS_AFTER_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH))   ,$(eval $(def_pass_subdir)))
     3151$(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(KBUILD_TARGET))  $(MAKEFILES_AFTER_$(PASS).$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)) ,$(eval $(def_pass_makefile)))
    31523152
    31533153ifdef KBUILD_SAFE_PARALLEL
    … …  
    32533253        @$(ECHO) "  INSTARGET_$(target)=$(INSTARGET_$(target))" $(NLTAB)\
    32543254$(foreach prop,$(PROPS_SINGLE) $(PROPS_ACCUMULATE_L) $(PROPS_ACCUMULATE_R) OBJS_ CLEAN, \
    3255         $(eval _tmp:=$(firstword $($(target)_BLD_TRG) $(BUILD_TARGET))) \
     3255        $(eval _tmp:=$(firstword $($(target)_BLD_TRG) $(KBUILD_TARGET))) \
    32563256        $(if $($(target)_$(prop).$(_tmp)),\
    32573257                @$(ECHO) "  $(target)_$(prop).$(_tmp)=$($(target)_$(prop).$(_tmp))" $(NLTAB)) \
    … …  
    32593259)\
    32603260$(foreach prop,$(PROPS_DEFERRED), \
    3261         $(eval _tmp:=$(firstword $($(target)_BLD_TRG) $(BUILD_TARGET))) \
     3261        $(eval _tmp:=$(firstword $($(target)_BLD_TRG) $(KBUILD_TARGET))) \
    32623262        $(if $(value $(target)_$(prop).$(_tmp)),\
    32633263                @$(ECHO) '  $(target)_$(prop).$(_tmp)=$(value $(TARGET)_$(prop).$(_tmp))' $(NLTAB)) \

  • trunk/kBuild/header.kmk

    r1501 r1504  
    44# kBuild - File included at top of a makefile.
    55#
    6 # Copyright (c) 2004-2007 knut st. osmundsen <[email protected]>
     6# Copyright (c) 2004-2008 knut st. osmundsen <[email protected]>
    77#
    88#
    … …  
    4949 endif
    5050else
    51  ifneq ($(int-ge $(KBUILD_VERSION_PATCH),2),1)
    52   $(warning kBuild: kmk version mismatch! Expected 0.1.2 or later. Actual version is $(KBUILD_VERSION_MAJOR).$(KBUILD_VERSION_MINOR).$(KBUILD_VERSION_PATCH).)
     51 ifneq ($(int-ge $(KBUILD_VERSION_PATCH),3),1)
     52  $(warning kBuild: kmk version mismatch! Expected 0.1.3 or later. Actual version is $(KBUILD_VERSION_MAJOR).$(KBUILD_VERSION_MINOR).$(KBUILD_VERSION_PATCH).)
    5353 endif
    5454endif
    … …  
    160160# Set default build type.
    161161#
    162 ifndef BUILD_TYPE
    163  BUILD_TYPE := release
    164 else
    165  if1of ($(BUILD_TYPE), $(KBUILD_OSES) $(KBUILD_ARCHES))
    166   $(error kBuild: The BUILD_TYPE value '$(BUILD_TYPE)' is an OS or architecture!)
    167  endif
    168  ifneq (.$(words $(BUILD_TYPE)).$(BUILD_TYPE).,.1.$(strip $(BUILD_TYPE)).)
    169   $(error kBuild: The BUILD_TYPE value '$(BUILD_TYPE)' contains spaces/tabs!)
    170  endif
     162ifndef KBUILD_TYPE
     163 ifdef BUILD_TYPE
     164  KBUILD_TYPE := $(BUILD_TYPE)
     165 endif
     166else ifdef BUILD_TYPE
     167 ifneq ($(KBUILD_TYPE),$(BUILD_TYPE))
     168  ifeq ($(origin KBUILD_TYPE):$(origin BUILD_TYPE),environment:command line)
     169   KBUILD_TYPE := $(BUILD_TYPE)
     170  else ifneq ($(origin KBUILD_TYPE):$(origin BUILD_TYPE),command line:environment)
     171   $(error kBuild: KBUILD_TYPE and BUILD_TYPE disagree.)
     172  endif
     173 endif
     174endif
     175override BUILD_TYPE = $(KBUILD_TYPE)
     176
     177ifndef KBUILD_TYPE
     178 KBUILD_TYPE := release
     179else
     180 if1of ($(KBUILD_TYPE), $(KBUILD_OSES) $(KBUILD_ARCHES))
     181  $(error kBuild: The KBUILD_TYPE value '$(KBUILD_TYPE)' is an OS or architecture!)
     182 endif
     183 ifneq (.$(words $(KBUILD_TYPE)).$(KBUILD_TYPE).,.1.$(strip $(KBUILD_TYPE)).)
     184  $(error kBuild: The KBUILD_TYPE value '$(KBUILD_TYPE)' contains spaces/tabs!)
     185 endif
     186endif
     187
     188
     189#
     190# Host platform legacy
     191# kmk deals with this, so this is only temporary until I've rebuilt everything.
     192#
     193ifndef KBUILD_HOST
     194 KBUILD_HOST := $(BUILD_PLATFORM)
     195endif
     196ifndef KBUILD_HOST_ARCH
     197 KBUILD_HOST_ARCH := $(BUILD_PLATFORM_ARCH)
     198endif
     199ifndef KBUILD_HOST_CPU
     200 KBUILD_HOST_CPU := $(BUILD_PLATFORM_CPU)
    171201endif
    172202
    … …  
    178208# unless the user starts messing about with environment variables.
    179209#
    180 ifneq (.$(words $(BUILD_PLATFORM)).$(BUILD_PLATFORM).,.1.$(strip $(BUILD_PLATFORM)).)
    181  $(error kBuild: The BUILD_PLATFORM value '$(BUILD_PLATFORM)' contains spaces/tabs!)
    182 endif
    183 ifneq ($(words $(filter $(BUILD_PLATFORM),$(KBUILD_OSES))),1)
    184  $(error kBuild: BUILD_PLATFORM value '$(BUILD_PLATFORM)' is not recognized (valid: $(KBUILD_OSES)))
    185 endif
    186 
    187 ifneq (.$(words $(BUILD_PLATFORM_ARCH)).$(BUILD_PLATFORM_ARCH).,.1.$(strip $(BUILD_PLATFORM_ARCH)).)
    188  $(error kBuild: The BUILD_PLATFORM_ARCH value '$(BUILD_PLATFORM_ARCH)' contains spaces/tabs!)
    189 endif
    190 ifneq ($(words $(filter $(BUILD_PLATFORM_ARCH),$(KBUILD_ARCHES))),1)
    191  $(error kBuild: BUILD_PLATFORM_ARCH value '$(BUILD_PLATFORM_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
    192 endif
    193 
    194 ifeq ($(strip $(BUILD_PLATFORM_CPU)),)
    195  BUILD_PLATFORM_CPU := blend
    196 else
    197  ifneq (.$(words $(BUILD_PLATFORM_CPU)).$(BUILD_PLATFORM_CPU).,.1.$(strip $(BUILD_PLATFORM_CPU)).)
    198   $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' contains spaces/tabs!)
    199  endif
    200  if1of ($(BUILD_PLATFORM_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
    201   $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' was found in the OS or architecture keywords!)
    202  endif
    203  ifeq ($(BUILD_PLATFORM_CPU),$(BUILD_TYPE))
    204   $(error kBuild: The BUILD_PLATFORM_CPU value '$(BUILD_PLATFORM_CPU)' is the same as the BUILD_TYPE!)
    205  endif
    206 endif
     210ifneq (.$(words $(KBUILD_HOST)).$(KBUILD_HOST).,.1.$(strip $(KBUILD_HOST)).)
     211 $(error kBuild: The KBUILD_HOST value '$(KBUILD_HOST)' contains spaces/tabs!)
     212endif
     213ifneq ($(words $(filter $(KBUILD_HOST),$(KBUILD_OSES))),1)
     214 $(error kBuild: KBUILD_HOST value '$(KBUILD_HOST)' is not recognized (valid: $(KBUILD_OSES)))
     215endif
     216
     217ifneq (.$(words $(KBUILD_HOST_ARCH)).$(KBUILD_HOST_ARCH).,.1.$(strip $(KBUILD_HOST_ARCH)).)
     218 $(error kBuild: The KBUILD_HOST_ARCH value '$(KBUILD_HOST_ARCH)' contains spaces/tabs!)
     219endif
     220ifneq ($(words $(filter $(KBUILD_HOST_ARCH),$(KBUILD_ARCHES))),1)
     221 $(error kBuild: KBUILD_HOST_ARCH value '$(KBUILD_HOST_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
     222endif
     223
     224ifeq ($(strip $(KBUILD_HOST_CPU)),)
     225 KBUILD_HOST_CPU := blend
     226else
     227 ifneq (.$(words $(KBUILD_HOST_CPU)).$(KBUILD_HOST_CPU).,.1.$(strip $(KBUILD_HOST_CPU)).)
     228  $(error kBuild: The KBUILD_HOST_CPU value '$(KBUILD_HOST_CPU)' contains spaces/tabs!)
     229 endif
     230 if1of ($(KBUILD_HOST_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
     231  $(error kBuild: The KBUILD_HOST_CPU value '$(KBUILD_HOST_CPU)' was found in the OS or architecture keywords!)
     232 endif
     233 ifeq ($(KBUILD_HOST_CPU),$(KBUILD_TYPE))
     234  $(error kBuild: The KBUILD_HOST_CPU value '$(KBUILD_HOST_CPU)' is the same as the KBUILD_TYPE!)
     235 endif
     236endif
     237
     238
     239#
     240# Deal with target platform legacy.
     241#
     242ifndef KBUILD_TARGET
     243 ifdef BUILD_TARGET
     244  KBUILD_TARGET := $(BUILD_TARGET)
     245 endif
     246else ifdef BUILD_TARGET
     247 ifneq ($(KBUILD_TARGET),$(BUILD_TARGET))
     248  ifeq ($(origin KBUILD_TARGET):$(origin BUILD_TARGET),environment:command line)
     249   KBUILD_TARGET := $(BUILD_TARGET)
     250  else ifneq ($(origin KBUILD_TARGET):$(origin BUILD_TARGET),command line:environment)
     251   $(error kBuild: KBUILD_TARGET and BUILD_TARGET disagree)
     252  endif
     253 endif
     254endif
     255override BUILD_TARGET = $(KBUILD_TARGET)
     256
     257ifndef KBUILD_TARGET_ARCH
     258 ifdef BUILD_TARGET_ARCH
     259  KBUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH)
     260 endif
     261else ifdef BUILD_TARGET_ARCH
     262 ifneq ($(KBUILD_TARGET_ARCH),$(BUILD_TARGET_ARCH))
     263  ifeq ($(origin KBUILD_TARGET_ARCH):$(origin BUILD_TARGET_ARCH),environment:command line)
     264   KBUILD_TARGET_ARCH := $(BUILD_TARGET_ARCH)
     265  else ifneq ($(origin KBUILD_TARGET_ARCH):$(origin BUILD_TARGET_ARCH),command line:environment)
     266   $(error kBuild: KBUILD_TARGET_ARCH and BUILD_TARGET_ARCH disagree)
     267  endif
     268 endif
     269endif
     270override BUILD_TARGET_ARCH = $(KBUILD_TARGET_ARCH)
     271
     272ifndef KBUILD_TARGET_CPU
     273 ifdef BUILD_TARGET_CPU
     274  KBUILD_TARGET_CPU := $(BUILD_TARGET_CPU)
     275 endif
     276else ifdef BUILD_TARGET_CPU
     277 ifneq ($(KBUILD_TARGET_CPU),$(BUILD_TARGET_CPU))
     278  ifeq ($(origin KBUILD_TARGET_CPU):$(origin BUILD_TARGET_CPU),environment:command line)
     279   KBUILD_TARGET_CPU := $(BUILD_TARGET_CPU)
     280  else ifneq ($(origin KBUILD_TARGET_CPU):$(origin BUILD_TARGET_CPU),command line:environment)
     281   $(error kBuild: KBUILD_TARGET_CPU and BUILD_TARGET_CPU disagree)
     282  endif
     283 endif
     284endif
     285override BUILD_TARGET_CPU = $(KBUILD_TARGET_CPU)
    207286
    208287
    209288#
    210289# Assert or set default target platform.
    211 # When not defined use the corresponding BUILD_PLATFORM value.
    212 #
    213 ifndef BUILD_TARGET
    214  BUILD_TARGET := $(BUILD_PLATFORM)
    215 else
    216  ifneq (.$(words $(BUILD_TARGET)).$(BUILD_TARGET).,.1.$(strip $(BUILD_TARGET)).)
    217   $(error kBuild: The BUILD_TARGET value '$(BUILD_TARGET)' contains spaces/tabs!)
    218  endif
    219  ifneq ($(words $(filter $(BUILD_TARGET),$(KBUILD_OSES))),1)
    220   $(error kBuild: BUILD_TARGET value '$(BUILD_TARGET)' is not recognized (valid: $(KBUILD_OSES)))
    221  endif
    222 endif
    223 
    224 ifndef BUILD_TARGET_ARCH
    225  BUILD_TARGET_ARCH := $(BUILD_PLATFORM_ARCH)
    226 else
    227  ifneq (.$(words $(BUILD_TARGET_ARCH)).$(BUILD_TARGET_ARCH).,.1.$(strip $(BUILD_TARGET_ARCH)).)
    228   $(error kBuild: The BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)' contains spaces/tabs!)
    229  endif
    230  ifneq ($(words $(filter $(BUILD_TARGET_ARCH),$(KBUILD_ARCHES))),1)
    231   $(error kBuild: BUILD_TARGET_ARCH value '$(BUILD_TARGET_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
    232  endif
    233 endif
    234 
    235 ifndef BUILD_TARGET_CPU
    236  BUILD_TARGET_CPU := $(BUILD_PLATFORM_CPU)
    237 else ifeq ($(strip $(BUILD_TARGET_CPU)),)
    238  ifeq ($(BUILD_TARGET_ARCH),$(BUILD_PLATFORM_ARCH))
    239   BUILD_TARGET_CPU := $(BUILD_PLATFORM_CPU)
     290# When not defined use the corresponding KBUILD_HOST value.
     291#
     292ifndef KBUILD_TARGET
     293 KBUILD_TARGET := $(KBUILD_HOST)
     294else
     295 ifneq (.$(words $(KBUILD_TARGET)).$(KBUILD_TARGET).,.1.$(strip $(KBUILD_TARGET)).)
     296  $(error kBuild: The KBUILD_TARGET value '$(KBUILD_TARGET)' contains spaces/tabs!)
     297 endif
     298 ifneq ($(words $(filter $(KBUILD_TARGET),$(KBUILD_OSES))),1)
     299  $(error kBuild: KBUILD_TARGET value '$(KBUILD_TARGET)' is not recognized (valid: $(KBUILD_OSES)))
     300 endif
     301endif
     302
     303ifndef KBUILD_TARGET_ARCH
     304 KBUILD_TARGET_ARCH := $(KBUILD_HOST_ARCH)
     305else
     306 ifneq (.$(words $(KBUILD_TARGET_ARCH)).$(KBUILD_TARGET_ARCH).,.1.$(strip $(KBUILD_TARGET_ARCH)).)
     307  $(error kBuild: The KBUILD_TARGET_ARCH value '$(KBUILD_TARGET_ARCH)' contains spaces/tabs!)
     308 endif
     309 ifneq ($(words $(filter $(KBUILD_TARGET_ARCH),$(KBUILD_ARCHES))),1)
     310  $(error kBuild: KBUILD_TARGET_ARCH value '$(KBUILD_TARGET_ARCH)' is not recognized (valid: $(KBUILD_ARCHES)))
     311 endif
     312endif
     313
     314ifndef KBUILD_TARGET_CPU
     315 KBUILD_TARGET_CPU := $(KBUILD_HOST_CPU)
     316else ifeq ($(strip $(KBUILD_TARGET_CPU)),)
     317 ifeq ($(KBUILD_TARGET_ARCH),$(KBUILD_HOST_ARCH))
     318  KBUILD_TARGET_CPU := $(KBUILD_HOST_CPU)
    240319 else
    241   BUILD_TARGET_CPU := blend
    242  endif
    243 else
    244  ifneq (.$(words $(BUILD_TARGET_CPU)).$(BUILD_TARGET_CPU).,.1.$(strip $(BUILD_TARGET_CPU)).)
    245   $(error kBuild: The BUILD_TARGET_CPU value '$(BUILD_TARGET_CPU)' contains spaces/tabs!)
    246  endif
    247  if1of ($(BUILD_TARGET_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
    248   $(error kBuild: The BUILD_TARGET_CPU value was found in the OS or architecture keywords!)
    249  endif
    250  ifeq ($(BUILD_TARGET_CPU),$(BUILD_TYPE))
    251   $(error kBuild: The BUILD_TARGET_CPU value '$(BUILD_TARGET_CPU)' is the same as the BUILD_TYPE!)
     320  KBUILD_TARGET_CPU := blend
     321 endif
     322else
     323 ifneq (.$(words $(KBUILD_TARGET_CPU)).$(KBUILD_TARGET_CPU).,.1.$(strip $(KBUILD_TARGET_CPU)).)
     324  $(error kBuild: The KBUILD_TARGET_CPU value '$(KBUILD_TARGET_CPU)' contains spaces/tabs!)
     325 endif
     326 if1of ($(KBUILD_TARGET_CPU), $(KBUILD_OSES) $(BUILD_ARCHES))
     327  $(error kBuild: The KBUILD_TARGET_CPU value was found in the OS or architecture keywords!)
     328 endif
     329 ifeq ($(KBUILD_TARGET_CPU),$(KBUILD_TYPE))
     330  $(error kBuild: The KBUILD_TARGET_CPU value '$(KBUILD_TARGET_CPU)' is the same as the KBUILD_TYPE!)
    252331 endif
    253332endif
    … …  
    292371endif
    293372ifndef PATH_OUT
    294  ifdef BUILD_TARGET_SUB # (BUILD_TARGET_SUB is not currently recognized by kBuild in any other places.)
    295   PATH_OUT          := $(PATH_OUT_BASE)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH).$(BUILD_TARGET_SUB)/$(BUILD_TYPE)
     373 ifdef BUILD_TARGET_SUB # (BUILD_TARGET_SUB is not currently recognized by kBuild in any other places - obsolete)
     374  PATH_OUT          := $(PATH_OUT_BASE)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH).$(BUILD_TARGET_SUB)/$(KBUILD_TYPE)
    296375 else
    297   PATH_OUT          := $(PATH_OUT_BASE)/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/$(BUILD_TYPE)
     376  PATH_OUT          := $(PATH_OUT_BASE)/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/$(KBUILD_TYPE)
    298377 endif
    299378endif # !define PATH_OUT
    … …  
    308387PATH_DOC             = $(PATH_INS)/doc
    309388
    310 # PATH_KBUILD is determined by kmk.
    311 ifeq ($(strip $(PATH_KBUILD)),)
    312  $(error kBuild: PATH_KBUILD is missing or empty! kmk is supposed to set it.)
    313 endif
    314 # PATH_KBUILD_BIN is determined by kmk.
    315 ifeq ($(strip $(PATH_KBUILD_BIN)),)
    316  $(error kBuild: PATH_KBUILD_BIN is missing or empty! kmk is supposed to set it.)
     389# KBUILD_PATH / PATH_KBUILD is determined by kmk.
     390ifndef KBUILD_PATH
     391 KBUILD_PATH := $(PATH_KBUILD)
     392endif
     393ifeq ($(strip $(KBUILD_PATH)),)
     394 $(error kBuild: KBUILD_PATH is missing or empty! kmk is supposed to set it.)
     395endif
     396# KBUILD_BIN_PATH / PATH_KBUILD_BIN is determined by kmk.
     397ifndef KBUILD_BIN_PATH
     398 KBUILD_BIN_PATH := $(PATH_KBUILD_BIN)
     399endif
     400ifeq ($(strip $(KBUILD_BIN_PATH)),)
     401 $(error kBuild: KBUILD_BIN_PATH is missing or empty! kmk is supposed to set it.)
    317402endif
    318403
    319404# kBuild files which might be of interest.
    320 FILE_KBUILD_HEADER  := $(PATH_KBUILD)/header.kmk
    321 #FILE_KBUILD_CONFIG  := $(PATH_KBUILD)/config.kmk
    322 FILE_KBUILD_FOOTER  := $(PATH_KBUILD)/footer.kmk
     405FILE_KBUILD_HEADER  := $(KBUILD_PATH)/header.kmk
     406#FILE_KBUILD_CONFIG  := $(KBUILD_PATH)/config.kmk
     407FILE_KBUILD_FOOTER  := $(KBUILD_PATH)/footer.kmk
    323408
    324409## MAKEFILE is the name of the main makefile.
    … …  
    335420
    336421# OS/2
    337 ifeq ($(BUILD_PLATFORM),os2)
     422ifeq ($(KBUILD_HOST),os2)
    338423EXEC_X86_WIN32      := innopec.exe
    339424HOSTSUFF_EXE        := .exe
    … …  
    341426
    342427# Linux
    343 ifeq ($(BUILD_PLATFORM),linux)
     428ifeq ($(KBUILD_HOST),linux)
    344429EXEC_X86_WIN32      := wine
    345430HOSTSUFF_EXE        :=
    … …  
    347432
    348433# Win, Win32, Win64, NT.
    349 if1of ($(BUILD_PLATFORM), win nt)
     434if1of ($(KBUILD_HOST), win nt)
    350435EXEC_X86_WIN32      :=
    351436HOSTSUFF_EXE        := .exe
    … …  
    353438
    354439# FreeBSD
    355 ifeq ($(BUILD_PLATFORM),freebsd)
     440ifeq ($(KBUILD_HOST),freebsd)
    356441EXEC_X86_WIN32      := wine
    357442HOSTSUFF_EXE        :=
    … …  
    359444
    360445# Darwin / Mac OS X
    361 ifeq ($(BUILD_PLATFORM),darwin)
     446ifeq ($(KBUILD_HOST),darwin)
    362447EXEC_X86_WIN32      := false
    363448HOSTSUFF_EXE        :=
    … …  
    365450
    366451# Solaris
    367 ifeq ($(BUILD_PLATFORM),solaris)
     452ifeq ($(KBUILD_HOST),solaris)
    368453EXEC_X86_WIN32      := false
    369454HOSTSUFF_EXE        :=
    … …  
    376461#
    377462SUFF_DEP    := .dep
    378 if1of ($(BUILD_TARGET), win nt os2)
     463if1of ($(KBUILD_TARGET), win nt os2)
    379464SUFF_OBJ    := .obj
    380465SUFF_LIB    := .lib
    … …  
    383468SUFF_SYS    := .sys
    384469SUFF_RES    := .res
    385 else ifeq ($(BUILD_TARGET),l4)
     470else ifeq ($(KBUILD_TARGET),l4)
    386471SUFF_OBJ    := .o
    387472SUFF_LIB    := .a
    … …  
    390475SUFF_SYS    := .a
    391476SUFF_RES    :=
    392 else ifeq ($(BUILD_TARGET),darwin)
     477else ifeq ($(KBUILD_TARGET),darwin)
    393478SUFF_OBJ    := .o
    394479SUFF_LIB    := .a
    … …  
    402487SUFF_DLL    := .so
    403488SUFF_EXE    :=
    404  if1of ($(BUILD_TARGET), freebsd linux netbsd openbsd) ## @todo check netbsd and openbsd.
     489 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) ## @todo check netbsd and openbsd.
    405490SUFF_SYS    := .ko
    406491 else
    … …  
    414499#
    415500ifeq ($(KMK),kmk)
    416 KMK         := $(PATH_KBUILD_BIN)/kmk$(HOSTSUFF_EXE)
     501KMK         := $(KBUILD_BIN_PATH)/kmk$(HOSTSUFF_EXE)
    417502endif
    418503MAKE        := $(KMK)
    419504
    420 GMAKE       := $(PATH_KBUILD_BIN)/kmk_gmake$(HOSTSUFF_EXE)
    421 
    422 DEP_EXT     := $(PATH_KBUILD_BIN)/kDep$(HOSTSUFF_EXE)
     505GMAKE       := $(KBUILD_BIN_PATH)/kmk_gmake$(HOSTSUFF_EXE)
     506
     507DEP_EXT     := $(KBUILD_BIN_PATH)/kDep$(HOSTSUFF_EXE)
    423508if1of (kDep, $(KMK_BUILTIN))
    424509DEP         := kmk_builtin_kDep
    … …  
    427512endif
    428513
    429 DEP_IDB_EXT := $(PATH_KBUILD_BIN)/kDepIDB$(HOSTSUFF_EXE)
     514DEP_IDB_EXT := $(KBUILD_BIN_PATH)/kDepIDB$(HOSTSUFF_EXE)
    430515if1of (kDepIDB, $(KMK_BUILTIN))
    431516DEP_IDB     := kmk_builtin_kDepIDB
    … …  
    434519endif
    435520
    436 DEP_PRE_EXT := $(PATH_KBUILD_BIN)/kDepPre$(HOSTSUFF_EXE)
     521DEP_PRE_EXT := $(KBUILD_BIN_PATH)/kDepPre$(HOSTSUFF_EXE)
    437522if1of (kDepPre, $(KMK_BUILTIN))
    438523DEP_PRE     := kmk_builtin_kDepPre
    … …  
    441526endif
    442527
    443 KOBJCACHE_EXT := $(PATH_KBUILD_BIN)/kObjCache$(HOSTSUFF_EXE)
     528KOBJCACHE_EXT := $(KBUILD_BIN_PATH)/kObjCache$(HOSTSUFF_EXE)
    444529if1of (kObjCache, $(KMK_BUILTIN))
    445530KOBJCACHE   := kmk_builtin_kObjCache
    … …  
    448533endif
    449534
    450 APPEND_EXT  := $(PATH_KBUILD_BIN)/kmk_append$(HOSTSUFF_EXE)
     535APPEND_EXT  := $(KBUILD_BIN_PATH)/kmk_append$(HOSTSUFF_EXE)
    451536APPEND      := kmk_builtin_append
    452537
    453 CAT_EXT     := $(PATH_KBUILD_BIN)/kmk_cat$(HOSTSUFF_EXE)
     538CAT_EXT     := $(KBUILD_BIN_PATH)/kmk_cat$(HOSTSUFF_EXE)
    454539CAT         := kmk_builtin_cat
    455540
    456 CMP_EXT     := $(PATH_KBUILD_BIN)/kmk_cmp$(HOSTSUFF_EXE)
     541CMP_EXT     := $(KBUILD_BIN_PATH)/kmk_cmp$(HOSTSUFF_EXE)
    457542CMP         := kmk_builtin_cmp
    458543
    459 CP_EXT      := $(PATH_KBUILD_BIN)/kmk_cp$(HOSTSUFF_EXE)
     544CP_EXT      := $(KBUILD_BIN_PATH)/kmk_cp$(HOSTSUFF_EXE)
    460545CP          := kmk_builtin_cp
    461546
    462 ECHO_EXT    := $(PATH_KBUILD_BIN)/kmk_echo$(HOSTSUFF_EXE)
     547ECHO_EXT    := $(KBUILD_BIN_PATH)/kmk_echo$(HOSTSUFF_EXE)
    463548ECHO        := kmk_builtin_echo
    464549
    465 INSTALL_EXT := $(PATH_KBUILD_BIN)/kmk_install$(HOSTSUFF_EXE)
     550INSTALL_EXT := $(KBUILD_BIN_PATH)/kmk_install$(HOSTSUFF_EXE)
    466551INSTALL     := kmk_builtin_install
    467552
    468 LN_EXT      := $(PATH_KBUILD_BIN)/kmk_ln$(HOSTSUFF_EXE)
     553LN_EXT      := $(KBUILD_BIN_PATH)/kmk_ln$(HOSTSUFF_EXE)
    469554LN          := kmk_builtin_ln
    470555
    471 MD5SUM_EXT  := $(PATH_KBUILD_BIN)/kmk_md5sum$(HOSTSUFF_EXE)
     556MD5SUM_EXT  := $(KBUILD_BIN_PATH)/kmk_md5sum$(HOSTSUFF_EXE)
    472557MD5SUM      := kmk_builtin_md5sum
    473558
    474 MKDIR_EXT   := $(PATH_KBUILD_BIN)/kmk_mkdir$(HOSTSUFF_EXE)
     559MKDIR_EXT   := $(KBUILD_BIN_PATH)/kmk_mkdir$(HOSTSUFF_EXE)
    475560MKDIR       := kmk_builtin_mkdir
    476561
    477 MV_EXT      := $(PATH_KBUILD_BIN)/kmk_mv$(HOSTSUFF_EXE)
     562MV_EXT      := $(KBUILD_BIN_PATH)/kmk_mv$(HOSTSUFF_EXE)
    478563MV          := kmk_builtin_mv
    479564
    480 PRINTF_EXT  := $(PATH_KBUILD_BIN)/kmk_printf$(HOSTSUFF_EXE)
     565PRINTF_EXT  := $(KBUILD_BIN_PATH)/kmk_printf$(HOSTSUFF_EXE)
    481566PRINTF      := kmk_builtin_printf
    482567
    483 REDIRECT_EXT:= $(PATH_KBUILD_BIN)/kmk_redirect$(HOSTSUFF_EXE)
     568REDIRECT_EXT:= $(KBUILD_BIN_PATH)/kmk_redirect$(HOSTSUFF_EXE)
    484569if1of (redirect, $(KMK_BUILTIN))
    485570REDIRECT    := kmk_builtin_redirect
    … …  
    488573endif
    489574
    490 RM_EXT      := $(PATH_KBUILD_BIN)/kmk_rm$(HOSTSUFF_EXE)
     575RM_EXT      := $(KBUILD_BIN_PATH)/kmk_rm$(HOSTSUFF_EXE)
    491576RM          := kmk_builtin_rm
    492577
    493 RMDIR_EXT   := $(PATH_KBUILD_BIN)/kmk_rmdir$(HOSTSUFF_EXE)
     578RMDIR_EXT   := $(KBUILD_BIN_PATH)/kmk_rmdir$(HOSTSUFF_EXE)
    494579RMDIR       := kmk_builtin_rmdir
    495580
    496 SED_EXT     := $(PATH_KBUILD_BIN)/kmk_sed$(HOSTSUFF_EXE)
     581SED_EXT     := $(KBUILD_BIN_PATH)/kmk_sed$(HOSTSUFF_EXE)
    497582if1of (sed, $(KMK_BUILTIN))
    498583SED_INT     := kmk_builtin_sed
    … …  
    502587SED         := $(SED_EXT)
    503588
    504 TEST_EXT    := $(PATH_KBUILD_BIN)/kmk_test$(HOSTSUFF_EXE)
     589TEST_EXT    := $(KBUILD_BIN_PATH)/kmk_test$(HOSTSUFF_EXE)
    505590TEST        := kmk_builtin_test
    506591
    507592# Our default shell is the Almquist shell from *BSD.
    508 ASH         := $(PATH_KBUILD_BIN)/kmk_ash$(HOSTSUFF_EXE)
     593ASH         := $(KBUILD_BIN_PATH)/kmk_ash$(HOSTSUFF_EXE)
    509594MAKESHELL   := $(ASH)
    510595SHELL       := $(ASH)
    … …  
    10281113
    10291114else
    1030  _KBUILD_MSG_STYLE_FILE := $(firstword $(foreach path, $(KBUILD_MSG_STYLE_PATHS) $(PATH_KBUILD)/msgstyles, $(wildcard $(path)/$(KBUILD_MSG_STYLE).kmk)))
     1115 _KBUILD_MSG_STYLE_FILE := $(firstword $(foreach path, $(KBUILD_MSG_STYLE_PATHS) $(KBUILD_PATH)/msgstyles, $(wildcard $(path)/$(KBUILD_MSG_STYLE).kmk)))
    10311116 ifneq ($(_KBUILD_MSG_STYLE_FILE),)
    10321117  include $(_KBUILD_MSG_STYLE_FILE)
    … …  
    10791164
    10801165#
    1081 # Validate any KBUILD_BLD_TYPES additions and finally the BUILD_TYPE.
     1166# Validate any KBUILD_BLD_TYPES additions and finally the KBUILD_TYPE.
    10821167#
    10831168if1of ($(KBUILD_BLD_TYPES), $(KBUILD_OSES))
    … …  
    10901175 $(error kBuild: found KBUILD_OSES in KBUILD_ARCHES!)
    10911176endif
    1092 ifn1of ($(BUILD_TYPE), $(KBUILD_BLD_TYPES))
    1093  $(error kBuild: BUILD_TYPE(=$(BUILD_TYPE)) is not found in KBUILD_BLD_TYPES(=$(KBUILD_BLD_TYPES))!)
     1177ifn1of ($(KBUILD_TYPE), $(KBUILD_BLD_TYPES))
     1178 $(error kBuild: KBUILD_TYPE(=$(KBUILD_TYPE)) is not found in KBUILD_BLD_TYPES(=$(KBUILD_BLD_TYPES))!)
    10941179endif
    10951180

  • trunk/kBuild/sdks/DXSDK.kmk

    r819 r1504  
    22## @file
    33#
    4 # kBuild SDK - The Microsoft Direct X SDK, targeting $(BUILD_TARGET).
     4# kBuild SDK - The Microsoft Direct X SDK, targeting $(KBUILD_TARGET).
    55#
    66# Copyright (c) 2006-2007 knut st. osmundsen <[email protected]>
    … …  
    2525#
    2626
    27 SDK_DXSDK := The Microsoft Direct X SDK, targeting $(BUILD_TARGET)
     27SDK_DXSDK := The Microsoft Direct X SDK, targeting $(KBUILD_TARGET)
    2828
    2929# SDK Specific Properties
    … …  
    5353PATH_SDK_DXSDK_LIB.x86 ?= $(PATH_SDK_DXSDK)/Lib/x86
    5454PATH_SDK_DXSDK_LIB.amd64 ?= $(PATH_SDK_DXSDK)/Lib/x64
    55 PATH_SDK_DXSDK_LIB ?= $(PATH_SDK_DXSDK_LIB.$(BUILD_TARGET_ARCH))
     55PATH_SDK_DXSDK_LIB ?= $(PATH_SDK_DXSDK_LIB.$(KBUILD_TARGET_ARCH))
    5656
    5757# General Properties used by kBuild

  • trunk/kBuild/sdks/LIBSDL.kmk

    r1243 r1504  
    22## @file
    33#
    4 # kBuild SDK - Simple DirectMedia Layer, targeting $(BUILD_TARGET).
     4# kBuild SDK - Simple DirectMedia Layer, targeting $(KBUILD_TARGET).
    55#
    66# Copyright (c) 2006-2007 knut st. osmundsen <[email protected]>
    … …  
    2525#
    2626
    27 SDK_LIBSDL := Simple DirectMedia Layer, targeting $(BUILD_TARGET).
     27SDK_LIBSDL := Simple DirectMedia Layer, targeting $(KBUILD_TARGET).
    2828
    2929# SDK Specific Properties
    … …  
    3939
    4040  # Darwin might have a framework for it.
    41   ifeq ($(BUILD_TARGET),darwin)
     41  ifeq ($(KBUILD_TARGET),darwin)
    4242   PATH_SDK_LIBSDL := $(firstword $(wildcard \
    4343        /System/Library/Frameworks/SDL.frameworks/SDL \
    … …  
    5252  ifeq ($(PATH_SDK_LIBSDL),)
    5353   # Search in the typical unix places.
    54    ifeq ($(filter-out %64,$(BUILD_TARGET_ARCH)),)
     54   ifeq ($(filter-out %64,$(KBUILD_TARGET_ARCH)),)
    5555    PATH_SDK_LIBSDL := $(firstword $(wildcard \
    5656        /lib64/libSDL.* \
    … …  
    9393else
    9494 PATH_SDK_LIBSDL := $(PATH_SDK_LIBSDL)
    95  ifeq ($(BUILD_TARGET),darwin)
     95 ifeq ($(KBUILD_TARGET),darwin)
    9696  # Check if it's the framework or not.
    9797  _SDK_LIBSDK_IS_FRAMEWORK := $(if $(wildcard $(PATH_SDK_LIBSDL)/Headers/SDL.h),yes)
    … …  
    103103# varies quite a bit, thus this kludge.
    104104#
    105 ifeq ($(BUILD_TARGET),os2)
     105ifeq ($(KBUILD_TARGET),os2)
    106106 LIB_SDK_LIBSDL_SDLMAIN  ?=
    107107 DLL_SDK_LIBSDL_SDL      ?= $(PATH_SDK_LIBSDL)/SDL/SDL12.dll
    … …  
    132132        $(PATH_SDK_LIBSDL)/SDLTTF
    133133
    134 else ifeq ($(BUILD_TARGET),win) # ASSUMES VC++ on windows, sorry.
     134else ifeq ($(KBUILD_TARGET),win) # ASSUMES VC++ on windows, sorry.
    135135 LIB_SDK_LIBSDL_SDLMAIN  ?= $(PATH_SDK_LIBSDL)/lib/SDLmain.lib
    136136 LIB_SDK_LIBSDL_SDL      ?= $(PATH_SDK_LIBSDL)/lib/SDL.lib
    … …  
    152152        $(PATH_SDK_LIBSDL)/lib
    153153
    154 else ifeq ($(BUILD_TARGET).$(_SDK_LIBSDK_IS_FRAMEWORK),darwin.yes)
     154else ifeq ($(KBUILD_TARGET).$(_SDK_LIBSDK_IS_FRAMEWORK),darwin.yes)
    155155 # darwin + framework
    156156 LIB_SDK_LIBSDL_SDLMAIN  ?= $(NO_SUCH_VARIABLE)

  • trunk/kBuild/sdks/W2K3DDK.kmk

    r851 r1504  
    22## @file
    33#
    4 # kBuild SDK - The Microsoft Windows 2003 DDK, targeting $(BUILD_TARGET).
     4# kBuild SDK - The Microsoft Windows 2003 DDK, targeting $(KBUILD_TARGET).
    55#
    66# Copyright (c) 2006-2007 knut st. osmundsen <[email protected]>
    … …  
    2525#
    2626
    27 SDK_W2K3DDK := The Microsoft Windows 2003 DDK, targeting $(BUILD_TARGET).
     27SDK_W2K3DDK := The Microsoft Windows 2003 DDK, targeting $(KBUILD_TARGET).
    2828
    2929# SDK Specific Properties
    … …  
    6060PATH_SDK_W2K3DDK_LIB.amd64 ?= $(PATH_SDK_W2K3DDK)/lib/wnet/AMD64
    6161PATH_SDK_W2K3DDK_LIB.x86 ?= $(PATH_SDK_W2K3DDK)/lib/wnet/i386
    62 PATH_SDK_W2K3DDK_LIB ?= $(PATH_SDK_W2K3DDK_LIB.$(BUILD_TARGET_ARCH))
     62PATH_SDK_W2K3DDK_LIB ?= $(PATH_SDK_W2K3DDK_LIB.$(KBUILD_TARGET_ARCH))
    6363
    6464# General Properties used by kBuild

  • trunk/kBuild/sdks/WINPSDK.kmk

    r1371 r1504  
    22## @file
    33#
    4 # kBuild SDK - The Windows Platform SDK, targeting (BUILD_TARGET).
     4# kBuild SDK - The Windows Platform SDK, targeting (KBUILD_TARGET).
    55#
    66# Copyright (c) 2006-2007 knut st. osmundsen <[email protected]>
    … …  
    2525#
    2626
    27 SDK_WINPSDK := The Windows Platform SDK, targeting (BUILD_TARGET).
     27SDK_WINPSDK := The Windows Platform SDK, targeting (KBUILD_TARGET).
    2828
    2929# SDK Specific Properties
    … …  
    6262PATH_SDK_WINPSDK_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64 $(PATH_SDK_WINPSDK)/[Ll][Ii][Bb]/[xX]64) $(PATH_SDK_WINPSDK)/Lib/AMD64)
    6363endif
    64 PATH_SDK_WINPSDK_LIB ?= $(PATH_SDK_WINPSDK_LIB.$(BUILD_TARGET_ARCH))
     64PATH_SDK_WINPSDK_LIB ?= $(PATH_SDK_WINPSDK_LIB.$(KBUILD_TARGET_ARCH))
    6565
    6666ifndef PATH_SDK_WINPSDK_BIN

  • trunk/kBuild/sdks/WINPSDKINCS.kmk

    r819 r1504  
    22## @file
    33#
    4 # kBuild SDK - The Windows Platform SDK, targeting (BUILD_TARGET) but
     4# kBuild SDK - The Windows Platform SDK, targeting (KBUILD_TARGET) but
    55#              without any libraries or LIBPATH properties.
    66#              Basically for finding specstrings.h when using the DDK.
    … …  
    2727#
    2828
    29 SDK_WINPSDKINCS := The Windows Platform SDK, targeting (BUILD_TARGET) but \
     29SDK_WINPSDKINCS := The Windows Platform SDK, targeting (KBUILD_TARGET) but \
    3030        without any library or LIBPATH properties. \
    3131        Basically for finding specstrings.h when using the DDK.
    … …  
    6969PATH_SDK_WINPSDKINCS_LIB.amd64 := $(firstword $(wildcard $(PATH_SDK_WINPSDKINCS)/[Ll][Ii][Bb]/[Aa][Mm][Dd]64) $(PATH_SDK_WINPSDKINCS)/Lib/AMD64)
    7070endif
    71 PATH_SDK_WINPSDKINCS_LIB ?= $(PATH_SDK_WINPSDKINCS_LIB.$(BUILD_TARGET_ARCH))
     71PATH_SDK_WINPSDKINCS_LIB ?= $(PATH_SDK_WINPSDKINCS_LIB.$(KBUILD_TARGET_ARCH))
    7272
    7373ifndef PATH_SDK_WINPSDKINCS_BIN

  • 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 <[email protected]>
    … …  
    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.

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