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

File:
1 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 <bird-kBuild-spam@anduin.net>
     6# Copyright (c) 2004-2008 knut st. osmundsen <bird-kBuild-spam@anduin.net>
    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)) \
Note: See TracChangeset for help on using the changeset viewer.