Ignore:
Timestamp:
Aug 19, 2006, 9:59:28 PM (19 years ago)
Author:
bird
Message:

Check for $(BUILD_TARGET).$(BUILD_TARGET_ARCH).

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/footer.kmk

    r473 r481  
    3535# all targets.
    3636ALL_TARGETS += \
    37         $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM)) \
    38         $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET)) \
    39         $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) \
    40         $(DLLS)        $(DLLS.$(BUILD_TARGET)) \
    41         $(PROGRAMS)    $(PROGRAMS.$(BUILD_TARGET)) \
    42         $(SYSMODS)     $(SYSMODS.$(BUILD_TARGET)) \
    43         $(INSTALLS)    $(INSTALLS.$(BUILD_TARGET)) \
    44         $(OTHERS)      $(OTHERS.$(BUILD_TARGET))
     37        $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
     38        $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET))     $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     39        $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET))   $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     40        $(DLLS)        $(DLLS.$(BUILD_TARGET))          $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     41        $(PROGRAMS)    $(PROGRAMS.$(BUILD_TARGET))      $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     42        $(SYSMODS)     $(SYSMODS.$(BUILD_TARGET))       $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     43        $(INSTALLS)    $(INSTALLS.$(BUILD_TARGET))      $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     44        $(OTHERS)      $(OTHERS.$(BUILD_TARGET))        $(OTHERS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
    4545
    4646# all $(BUILD_TARGET) targets.
    4747_ALL_BUILD_TARGET_TARGETS += \
    48         $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM)) \
    49         $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET)) \
    50         $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) \
    51         $(DLLS)        $(DLLS.$(BUILD_TARGET)) \
    52         $(PROGRAMS)    $(PROGRAMS.$(BUILD_TARGET)) \
    53         $(SYSMODS)     $(SYSMODS.$(BUILD_TARGET)) \
    54         $(INSTALLS)    $(INSTALLS.$(BUILD_TARGET)) \
    55         $(OTHERS)      $(OTHERS.$(BUILD_TARGET))
     48        $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) \
     49        $(LIBRARIES)   $(LIBRARIES.$(BUILD_TARGET))     $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \ 
     50        $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET))   $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \
     51        $(DLLS)        $(DLLS.$(BUILD_TARGET))          $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \       
     52        $(PROGRAMS)    $(PROGRAMS.$(BUILD_TARGET))      $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \   
     53        $(SYSMODS)     $(SYSMODS.$(BUILD_TARGET))       $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \   
     54        $(INSTALLS)    $(INSTALLS.$(BUILD_TARGET))      $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) \   
     55        $(OTHERS)      $(OTHERS.$(BUILD_TARGET))        $(OTHERS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))       
    5656
    5757# all $(BUILD_TARGET) targets.
    5858_ALL_BUILD_PLATFORM_TARGETS += \
    59         $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))
     59        $(BLDPROGS)    $(BLDPROGS.$(BUILD_PLATFORM))    $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH))
    6060
    6161# dependency files.
    … …  
    9797
    9898## Figure out the tool for a source
    99 # @param    $target      source file
    100 # @param    $source      normalized main target
    101 # @param    $type      tooltype
     99# @param    target       source file
     100# @param    source       normalized main target
     101# @param    type         tooltype
    102102# @param    bld_trg      build target.
     103# @param    bld_trg_arch build target architecture.
    103104_SOURCE_TOOL = $(strip $(firstword \
     105        $($(target)_$(source)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
    104106        $($(target)_$(source)_$(type)TOOL.$(bld_trg)) \
    105107        $($(target)_$(source)_$(type)TOOL) \
     108        $($(target)_$(source)_TOOL.$(bld_trg).$(bld_trg_arch)) \
    106109        $($(target)_$(source)_TOOL.$(bld_trg)) \
    107110        $($(target)_$(source)_TOOL) \
     111        $($(target)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
    108112        $($(target)_$(type)TOOL.$(bld_trg)) \
    109113        $($(target)_$(type)TOOL) \
     114        $($(target)_TOOL.$(bld_trg).$(bld_trg_arch)) \
    110115        $($(target)_TOOL.$(bld_trg)) \
    111116        $($(target)_TOOL) \
     117        $($(source)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
    112118        $($(source)_$(type)TOOL.$(bld_trg)) \
    113119        $($(source)_$(type)TOOL) \
     120        $($(source)_TOOL.$(bld_trg).$(bld_trg_arch)) \
    114121        $($(source)_TOOL.$(bld_trg)) \
    115122        $($(source)_TOOL) \
     123        $($(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
    116124        $($(type)TOOL.$(bld_trg)) \
    117125        $($(type)TOOL) \
     126        $(TOOL.$(bld_trg).$(bld_trg_arch)) \
    118127        $(TOOL.$(bld_trg)) \
    119128        $(TOOL) ))
    120129
    121130## Figure out the tool for a target.
    122 # @param    $target             normalized target.
    123 # @param    $source      tooltype.
     131# @param    target       normalized target.
     132# @param    source       tooltype.
    124133# @param    bld_trg      build target.
     134# @param    bld_trg_arch build target architecture.
    125135_TARGET_TOOL = $(strip $(firstword \
     136        $($(target)_$(source)TOOL.$(bld_trg).$(bld_trg_arch)) \
    126137        $($(target)_$(source)TOOL.$(bld_trg)) \
    127138        $($(target)_$(source)TOOL) \
     139        $($(target)_TOOL.$(bld_trg).$(bld_trg_arch)) \
    128140        $($(target)_TOOL.$(bld_trg)) \
    129141        $($(target)_TOOL) \
     142        $($(source)TOOL.$(bld_trg).$(bld_trg_arch)) \
    130143        $($(source)TOOL.$(bld_trg)) \
    131144        $($(source)TOOL) \
     145        $(TOOL.$(bld_trg).$(bld_trg_arch)) \
    132146        $(TOOL.$(bld_trg)) \
    133147        $(TOOL) \
    … …  
    216230
    217231$(foreach prop, $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED)\
    218 $(addsuffix .$(BUILD_TARGET), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
    219 $(addsuffix .$(BUILD_TARGET_ARCH), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
    220 $(addsuffix .$(BUILD_TARGET_CPU), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
    221 $(addsuffix .$(BUILD_TYPE), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
     232$(addsuffix .$(BUILD_TARGET),                      $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
     233$(addsuffix .$(BUILD_TARGET).$(BUILD_TARGET_ARCH), $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
     234$(addsuffix .$(BUILD_TARGET_ARCH),                 $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
     235$(addsuffix .$(BUILD_TARGET_CPU),                  $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
     236$(addsuffix .$(BUILD_TYPE),                        $(PROPS_SINGLE) $(PROPS_ACCUMULATE) $(PROPS_DEFERRED))\
    222237,$(eval $(def_template_extends_prop))) # exploits the 2 evaluation, so no value!
    223238endif
    … …  
    247262#$ (warning dbgsource: $(target)_$(prop).$(bld_trg)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    248263$(target)_$(prop).$(bld_trg) := $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
     264endif
     265endif
     266ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)
     267ifndef $(target)_$(prop).$(bld_trg).$(bld_trg_arch)
     268#$ (warning dbgsource: $(target)_$(prop).$(bld_trg).$(bld_trg_arch)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
     269$(target)_$(prop).$(bld_trg).$(bld_trg_arch) := $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
    249270endif
    250271endif
    … …  
    281302endif
    282303endif
     304ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)
     305ifndef $(target)_$(prop).$(bld_trg).$(bld_trg_arch)
     306#$ (warning dbgsource: $(target)_$(prop).$(bld_trg).$(bld_trg_arch)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
     307$(target)_$(prop).$(bld_trg).$(bld_trg_arch) = $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
     308endif
     309endif
    283310ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch)
    284311ifndef $(target)_$(prop).$(bld_trg_arch)
    … …  
    312339$(target)_$(prop).$(bld_trg) += $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    313340endif
     341ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)
     342#$ (warning dbg4: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
     343$(target)_$(prop).$(bld_trg).$(bld_trg_arch) += $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
     344endif
    314345ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu)
    315346#$ (warning dbg5: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    … …  
    354385# Include tools & sdks
    355386#
    356 _TOOLS := $(TOOL.$(BUILD_TARGET)) $(TOOL.$(BUILD_TARGET_ARCH)) $(TOOL.$(BUILD_PLATFORM)) $(TOOL.$(BUILD_PLATFORM_ARCH)) $(TOOL)
    357 _SDKS  := $(SDKS.$(BUILD_TARGET)) $(SDKS.$(BUILD_TARGET_ARCH)) $(SDKS.$(BUILD_PLATFORM)) $(SDKS.$(BUILD_PLATFORM_ARCH)) $(SDKS)
     387_TOOLS := $(TOOL.$(BUILD_TARGET)) $(TOOL.$(BUILD_TARGET_ARCH)) $(TOOL.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) $(TOOL.$(BUILD_PLATFORM)) $(TOOL.$(BUILD_PLATFORM_ARCH)) $(TOOL.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) $(TOOL)
     388_SDKS  := $(SDKS.$(BUILD_TARGET)) $(SDKS.$(BUILD_TARGET_ARCH)) $(SDKS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) $(SDKS.$(BUILD_PLATFORM)) $(SDKS.$(BUILD_PLATFORM_ARCH)) $(SDKS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)) $(SDKS)
    358389define def_tools_sdks_target_source
    359390$(eval _TOOLS += $(foreach prop, $(PROPS_TOOLS), \
    360391        $($(source)_$(prop).$(_bld_trg)) \
    361392        $($(target)_$(source)_$(prop).$(_bld_trg)) \
     393        $($(source)_$(prop).$(_bld_trg).$(_bld_trg_arch)) \
     394        $($(target)_$(source)_$(prop).$(_bld_trg).$(_bld_trg_arch)) \
    362395        $($(source)_$(prop).$(_bld_trg_arch)) \
    363396        $($(target)_$(source)_$(prop).$(_bld_trg_arch)) \
    … …  
    367400        $($(source)_SDKS.$(_bld_trg)) \
    368401        $($(target)_$(source)_SDKS.$(_bld_trg)) \
     402        $($(source)_SDKS.$(_bld_trg).$(_bld_trg_arch)) \
     403        $($(target)_$(source)_SDKS.$(_bld_trg).$(_bld_trg_arch)) \
    369404        $($(source)_SDKS.$(_bld_trg_arch)) \
    370405        $($(target)_$(source)_SDKS.$(_bld_trg_arch)) \
    … …  
    381416        $($(target)_$(prop).$(_bld_trg)) \
    382417        $($(target)_$(prop).$(_bld_trg_arch)) \
     418        $($(target)_$(prop).$(_bld_trg).$(_bld_trg_arch)) \
    383419        $($(target)_$(prop))))
    384420$(eval _SDKS += \
    385421        $($(target)_SDKS.$(_bld_trg)) \
    386422        $($(target)_SDKS.$(_bld_trg_arch)) \
     423        $($(target)_SDKS.$(_bld_trg).$(_bld_trg_arch)) \
    387424        $($(target)_SDKS))
    388425$(foreach source, \
    389426        $($(target)_SOURCES.$(_bld_trg)) \
    390427        $($(target)_SOURCES.$(_bld_trg_arch)) \
     428        $($(target)_SOURCES.$(_bld_trg).$(_bld_trg_arch)) \
    391429        $($(target)_SOURCES.$(_bld_trg_cpu)) \
    392430        $($(target)_SOURCES.$(BUILD_TYPE)) \
    … …  
    553591        $(TOOL_$(tool)_DEFS.$(bld_trg))\
    554592        $(TOOL_$(tool)_DEFS.$(bld_trg_arch))\
     593        $(TOOL_$(tool)_DEFS.$(bld_trg).$(bld_trg_arch))\
    555594        $(TOOL_$(tool)_DEFS.$(bld_trg_cpu))\
    556595        $(TOOL_$(tool)_$(type)DEFS)\
    557596        $(TOOL_$(tool)_$(type)DEFS.$(bld_type))\
    558597        $(foreach sdk, $(SDKS.$(bld_trg)) \
     598                                   $(SDKS.$(bld_trg).$(bld_trg_arch)) \
    559599                                   $(SDKS.$(bld_type)) \
    560600                                   $(SDKS),\
    … …  
    563603                $(SDK_$(sdk)_DEFS.$(bld_trg))\
    564604                $(SDK_$(sdk)_DEFS.$(bld_trg_arch))\
     605                $(SDK_$(sdk)_DEFS.$(bld_trg).$(bld_trg_arch))\
    565606                $(SDK_$(sdk)_DEFS.$(bld_trg_cpu))\
    566607                $(SDK_$(sdk)_$(type)DEFS)\
    … …  
    568609                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg))\
    569610                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg_arch))\
     611                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
    570612                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg_cpu)))\
    571613        $(DEFS)\
    … …  
    573615        $(DEFS.$(bld_trg))\
    574616        $(DEFS.$(bld_trg_arch))\
     617        $(DEFS.$(bld_trg).$(bld_trg_arch))\
    575618        $(DEFS.$(bld_trg_cpu))\
    576619        $($(type)DEFS)\
    … …  
    578621        $($(type)DEFS.$(bld_trg))\
    579622        $($(type)DEFS.$(bld_trg_arch))\
     623        $($(type)DEFS.$(bld_trg).$(bld_trg_arch))\
    580624        $($(type)DEFS.$(bld_trg_cpu))\
    581625        $(foreach sdk, $($(target)_SDKS.$(bld_trg)) \
     626                                   $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
    582627                                   $($(target)_SDKS.$(bld_type)) \
    583628                                   $($(target)_SDKS),\
    … …  
    586631                $(SDK_$(sdk)_DEFS.$(bld_trg))\
    587632                $(SDK_$(sdk)_DEFS.$(bld_trg_arch))\
     633                $(SDK_$(sdk)_DEFS.$(bld_trg).$(bld_trg_arch))\
    588634                $(SDK_$(sdk)_DEFS.$(bld_trg_cpu))\
    589635                $(SDK_$(sdk)_$(type)DEFS)\
    … …  
    591637                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg))\
    592638                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg_arch))\
     639                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
    593640                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg_cpu)))\
    594641        $($(target)_DEFS)\
    … …  
    596643        $($(target)_DEFS.$(bld_trg))\
    597644        $($(target)_DEFS.$(bld_trg_arch))\
     645        $($(target)_DEFS.$(bld_trg).$(bld_trg_arch))\
    598646        $($(target)_DEFS.$(bld_trg_cpu))\
    599647        $($(target)_$(type)DEFS)\
    … …  
    601649        $($(target)_$(type)DEFS.$(bld_trg))\
    602650        $($(target)_$(type)DEFS.$(bld_trg_arch))\
     651        $($(target)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
    603652        $($(target)_$(type)DEFS.$(bld_trg_cpu))\
    604653        $(foreach sdk, $($(source)_SDKS.$(bld_trg)) \
     654                                   $($(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
    605655                                   $($(source)_SDKS.$(bld_type)) \
    606656                                   $($(source)_SDKS),\
    … …  
    609659                $(SDK_$(sdk)_DEFS.$(bld_trg))\
    610660                $(SDK_$(sdk)_DEFS.$(bld_trg_arch))\
     661                $(SDK_$(sdk)_DEFS.$(bld_trg).$(bld_trg_arch))\
    611662                $(SDK_$(sdk)_DEFS.$(bld_trg_cpu))\
    612663                $(SDK_$(sdk)_$(type)DEFS)\
    … …  
    614665                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg))\
    615666                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg_arch))\
     667                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
    616668                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg_cpu)))\
    617669        $($(source)_DEFS)\
    … …  
    619671        $($(source)_DEFS.$(bld_trg))\
    620672        $($(source)_DEFS.$(bld_trg_arch))\
     673        $($(source)_DEFS.$(bld_trg).$(bld_trg_arch))\
    621674        $($(source)_DEFS.$(bld_trg_cpu))\
    622675        $($(source)_$(type)DEFS)\
    … …  
    624677        $($(source)_$(type)DEFS.$(bld_trg))\
    625678        $($(source)_$(type)DEFS.$(bld_trg_arch))\
     679        $($(source)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
    626680        $($(source)_$(type)DEFS.$(bld_trg_cpu))\
    627681        $(foreach sdk, $($(target)_$(source)_SDKS.$(bld_trg)) \
     682                                   $($(target)_$(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
    628683                                   $($(target)_$(source)_SDKS.$(bld_type)) \
    629684                                   $($(target)_$(source)_SDKS),\
    … …  
    632687                $(SDK_$(sdk)_DEFS.$(bld_trg))\
    633688                $(SDK_$(sdk)_DEFS.$(bld_trg_arch))\
     689                $(SDK_$(sdk)_DEFS.$(bld_trg).$(bld_trg_arch))\
    634690                $(SDK_$(sdk)_DEFS.$(bld_trg_cpu))\
    635691                $(SDK_$(sdk)_$(type)DEFS)\
    … …  
    637693                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg))\
    638694                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg_arch))\
     695                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
    639696                $(SDK_$(sdk)_$(type)DEFS.$(bld_trg_cpu)))\
    640697        $($(target)_$(source)_DEFS)\
    … …  
    642699        $($(target)_$(source)_DEFS.$(bld_trg))\
    643700        $($(target)_$(source)_DEFS.$(bld_trg_arch))\
     701        $($(target)_$(source)_DEFS.$(bld_trg).$(bld_trg_arch))\
    644702        $($(target)_$(source)_DEFS.$(bld_trg_cpu))\
    645703        $($(target)_$(source)_$(type)DEFS)\
    … …  
    647705        $($(target)_$(source)_$(type)DEFS.$(bld_trg))\
    648706        $($(target)_$(source)_$(type)DEFS.$(bld_trg_arch))\
     707        $($(target)_$(source)_$(type)DEFS.$(bld_trg).$(bld_trg_arch))\
    649708        $($(target)_$(source)_$(type)DEFS.$(bld_trg_cpu))
    650709incs        :=\
    651710        $($(target)_$(source)_$(type)INCS.$(bld_trg_cpu))\
     711        $($(target)_$(source)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
    652712        $($(target)_$(source)_$(type)INCS.$(bld_trg_arch))\
    653713        $($(target)_$(source)_$(type)INCS.$(bld_trg))\
    … …  
    655715        $($(target)_$(source)_$(type)INCS)\
    656716        $($(target)_$(source)_INCS.$(bld_trg_cpu))\
     717        $($(target)_$(source)_INCS.$(bld_trg).$(bld_trg_arch))\
    657718        $($(target)_$(source)_INCS.$(bld_trg_arch))\
    658719        $($(target)_$(source)_INCS.$(bld_trg))\
    … …  
    660721        $($(target)_$(source)_INCS)\
    661722        $(foreach sdk, $($(target)_$(source)_SDKS.$(bld_trg)) \
     723                                   $($(target)_$(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
    662724                                   $($(target)_$(source)_SDKS.$(bld_type)) \
    663725                                   $($(target)_$(source)_SDKS),\
    664726                $(SDK_$(sdk)_$(type)INCS.$(bld_trg_cpu))\
     727                $(SDK_$(sdk)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
    665728                $(SDK_$(sdk)_$(type)INCS.$(bld_trg_arch))\
    666729                $(SDK_$(sdk)_$(type)INCS.$(bld_trg))\
    … …  
    668731                $(SDK_$(sdk)_$(type)INCS)\
    669732                $(SDK_$(sdk)_INCS.$(bld_trg_cpu))\
     733                $(SDK_$(sdk)_INCS.$(bld_trg).$(bld_trg_arch))\
    670734                $(SDK_$(sdk)_INCS.$(bld_trg_arch))\
    671735                $(SDK_$(sdk)_INCS.$(bld_trg))\
    … …  
    673737                $(SDK_$(sdk)_INCS))\
    674738        $($(source)_$(type)INCS.$(bld_trg_cpu))\
     739        $($(source)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
    675740        $($(source)_$(type)INCS.$(bld_trg_arch))\
    676741        $($(source)_$(type)INCS.$(bld_trg))\
    … …  
    678743        $($(source)_$(type)INCS)\
    679744        $($(source)_INCS.$(bld_trg_cpu))\
     745        $($(source)_INCS.$(bld_trg).$(bld_trg_arch))\
    680746        $($(source)_INCS.$(bld_trg_arch))\
    681747        $($(source)_INCS.$(bld_trg))\
    … …  
    683749        $($(source)_INCS)\
    684750        $(foreach sdk, $($(source)_SDKS.$(bld_trg)) \
     751                                   $($(source)_SDKS.$(bld_trg).$(bld_trg_arch)) \
    685752                                   $($(source)_SDKS.$(bld_type)) \
    686753                                   $($(source)_SDKS),\
    687754                $(SDK_$(sdk)_$(type)INCS.$(bld_trg_cpu))\
     755                $(SDK_$(sdk)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
    688756                $(SDK_$(sdk)_$(type)INCS.$(bld_trg_arch))\
    689757                $(SDK_$(sdk)_$(type)INCS.$(bld_trg))\
    … …  
    691759                $(SDK_$(sdk)_$(type)INCS)\
    692760                $(SDK_$(sdk)_INCS.$(bld_trg_cpu))\
     761                $(SDK_$(sdk)_INCS.$(bld_trg).$(bld_trg_arch))\
    693762                $(SDK_$(sdk)_INCS.$(bld_trg_arch))\
    694763                $(SDK_$(sdk)_INCS.$(bld_trg))\
    … …  
    696765                $(SDK_$(sdk)_INCS))\
    697766        $($(target)_$(type)INCS.$(bld_trg_cpu))\
     767        $($(target)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
    698768        $($(target)_$(type)INCS.$(bld_trg_arch))\
    699769        $($(target)_$(type)INCS.$(bld_trg))\
    … …  
    701771        $($(target)_$(type)INCS)\
    702772        $($(target)_INCS.$(bld_trg_cpu))\
     773        $($(target)_INCS.$(bld_trg).$(bld_trg_arch))\
    703774        $($(target)_INCS.$(bld_trg_arch))\
    704775        $($(target)_INCS.$(bld_trg))\
    … …  
    706777        $($(target)_INCS)\
    707778        $(foreach sdk, $($(target)_SDKS.$(bld_trg)) \
     779                                   $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
    708780                                   $($(target)_SDKS.$(bld_type)) \
    709781                                   $($(target)_SDKS),\
    710782                $(SDK_$(sdk)_$(type)INCS.$(bld_trg_cpu))\
     783                $(SDK_$(sdk)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
    711784                $(SDK_$(sdk)_$(type)INCS.$(bld_trg_arch))\
    712785                $(SDK_$(sdk)_$(type)INCS.$(bld_trg))\
    … …  
    714787                $(SDK_$(sdk)_$(type)INCS)\
    715788                $(SDK_$(sdk)_INCS.$(bld_trg_cpu))\
     789                $(SDK_$(sdk)_INCS.$(bld_trg).$(bld_trg_arch))\
    716790                $(SDK_$(sdk)_INCS.$(bld_trg_arch))\
    717791                $(SDK_$(sdk)_INCS.$(bld_trg))\
    … …  
    719793                $(SDK_$(sdk)_INCS))\
    720794        $(INCS.$(bld_trg_cpu))\
     795        $(INCS.$(bld_trg).$(bld_trg_arch))\
    721796        $(INCS.$(bld_trg_arch))\
    722797        $(INCS.$(bld_trg))\
    … …  
    724799        $(INCS)\
    725800        $(foreach sdk, $(SDKS.$(bld_trg)) \
     801                                   $(SDKS.$(bld_trg).$(bld_trg_arch)) \
    726802                                   $(SDKS.$(bld_type)) \
    727803                                   $(SDKS),\
    728804                $(SDK_$(sdk)_$(type)INCS.$(bld_trg_cpu))\
     805                $(SDK_$(sdk)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
    729806                $(SDK_$(sdk)_$(type)INCS.$(bld_trg_arch))\
    730807                $(SDK_$(sdk)_$(type)INCS.$(bld_trg))\
    … …  
    732809                $(SDK_$(sdk)_$(type)INCS)\
    733810                $(SDK_$(sdk)_INCS.$(bld_trg_cpu))\
     811                $(SDK_$(sdk)_INCS.$(bld_trg).$(bld_trg_arch))\
    734812                $(SDK_$(sdk)_INCS.$(bld_trg_arch))\
    735813                $(SDK_$(sdk)_INCS.$(bld_trg))\
    … …  
    737815                $(SDK_$(sdk)_INCS))\
    738816        $(TOOL_$(tool)_$(type)INCS.$(bld_trg_cpu))\
     817        $(TOOL_$(tool)_$(type)INCS.$(bld_trg).$(bld_trg_arch))\
    739818        $(TOOL_$(tool)_$(type)INCS.$(bld_trg_arch))\
    740819        $(TOOL_$(tool)_$(type)INCS.$(bld_trg))\
    … …  
    746825        $(TOOL_$(tool)_$(type)FLAGS.$(bld_trg))\
    747826        $(TOOL_$(tool)_$(type)FLAGS.$(bld_trg_arch))\
     827        $(TOOL_$(tool)_$(type)FLAGS.$(bld_trg).$(bld_trg_arch))\
    748828        $(TOOL_$(tool)_$(type)FLAGS.$(bld_trg_cpu))\
    749829        $($(type)FLAGS)\
    … …  
    751831        $($(type)FLAGS.$(bld_trg))\
    752832        $($(type)FLAGS.$(bld_trg_arch))\
     833        $($(type)FLAGS.$(bld_trg).$(bld_trg_arch))\
    753834        $($(type)FLAGS.$(bld_trg_cpu))\
    754835        $($(target)_$(type)FLAGS)\
    … …  
    756837        $($(target)_$(type)FLAGS.$(bld_trg))\
    757838        $($(target)_$(type)FLAGS.$(bld_trg_arch))\
     839        $($(target)_$(type)FLAGS.$(bld_trg).$(bld_trg_arch))\
    758840        $($(target)_$(type)FLAGS.$(bld_trg_cpu))\
    759841        $($(source)_$(type)FLAGS)\
    … …  
    761843        $($(source)_$(type)FLAGS.$(bld_trg))\
    762844        $($(source)_$(type)FLAGS.$(bld_trg_arch))\
     845        $($(source)_$(type)FLAGS.$(bld_trg).$(bld_trg_arch))\
    763846        $($(source)_$(type)FLAGS.$(bld_trg_cpu))\
    764847        $($(target)_$(source)_$(type)FLAGS)\
    … …  
    766849        $($(target)_$(source)_$(type)FLAGS.$(bld_trg))\
    767850        $($(target)_$(source)_$(type)FLAGS.$(bld_trg_arch))\
     851        $($(target)_$(source)_$(type)FLAGS.$(bld_trg).$(bld_trg_arch))\
    768852        $($(target)_$(source)_$(type)FLAGS.$(bld_trg_cpu))
    769853objsuff     := $(firstword \
     854        $($(target)_$(source)_OBJSUFF.$(bld_trg).$(bld_trg_arch))\
    770855        $($(target)_$(source)_OBJSUFF.$(bld_trg))\
    771856        $($(target)_$(source)_OBJSUFF)\
     857        $($(source)_OBJSUFF.$(bld_trg).$(bld_trg_arch))\
    772858        $($(source)_OBJSUFF.$(bld_trg))\
    773859        $($(source)_OBJSUFF)\
     860        $($(target)_OBJSUFF.$(bld_trg).$(bld_trg_arch))\
    774861        $($(target)_OBJSUFF.$(bld_trg))\
    775862        $($(target)_OBJSUFF)\
     863        $(TOOL_$(tool)_$(type)OBJSUFF.$(bld_trg).$(bld_trg_arch))\
    776864        $(TOOL_$(tool)_$(type)OBJSUFF.$(bld_trg))\
    777865        $(TOOL_$(tool)_$(type)OBJSUFF)\
    … …  
    783871        $($(target)_$(source)_DEPS.$(bld_trg))\
    784872        $($(target)_$(source)_DEPS.$(bld_trg_arch))\
     873        $($(target)_$(source)_DEPS.$(bld_trg).$(bld_trg_arch))\
    785874        $($(target)_$(source)_DEPS.$(bld_trg_cpu))\
    786875        $($(source)_DEPS)\
    … …  
    788877        $($(source)_DEPS.$(bld_trg))\
    789878        $($(source)_DEPS.$(bld_trg_arch))\
     879        $($(source)_DEPS.$(bld_trg).$(bld_trg_arch))\
    790880        $($(source)_DEPS.$(bld_trg_cpu))\
    791881        $($(target)_DEPS)\
    792882        $($(target)_DEPS.$(bld_type))\
     883        $($(target)_DEPS.$(bld_trg))\
    793884        $($(target)_DEPS.$(bld_trg_arch))\
     885        $($(target)_DEPS.$(bld_trg).$(bld_trg_arch))\
    794886        $($(target)_DEPS.$(bld_trg_cpu))
    795887
    … …  
    804896ifndef TOOL_$(tool)_COMPILE_$(type)_CMDS
    805897$(warning kBuild: tools: \
    806         1 $($(target)_$(source)_$(type)TOOL.$(bld_trg)) \
    807         2 $($(target)_$(source)_$(type)TOOL) \
    808         3 $($(target)_$(source)_TOOL.$(bld_trg)) \
    809         4 $($(target)_$(source)_TOOL) \
    810         5 $($(target)_$(type)TOOL.$(bld_trg)) \
    811         6 $($(target)_$(type)TOOL) \
    812         7 $($(target)_TOOL.$(bld_trg)) \
    813         8 $($(target)_TOOL) \
    814         9 $($(source)_$(type)TOOL.$(bld_trg)) \
    815         10 $($(source)_$(type)TOOL) \
    816         11 $($(source)_TOOL.$(bld_trg)) \
    817         12 $($(source)_TOOL) \
    818         13 $($(type)TOOL.$(bld_trg)) \
    819         14 $($(type)TOOL) \
    820         15 $(TOOL.$(bld_trg)) \
    821         16 $(TOOL) )
     898        1 $($(target)_$(source)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
     899        2 $($(target)_$(source)_$(type)TOOL.$(bld_trg)) \
     900        3 $($(target)_$(source)_$(type)TOOL) \
     901        4 $($(target)_$(source)_TOOL.$(bld_trg).$(bld_trg_arch)) \
     902        5 $($(target)_$(source)_TOOL.$(bld_trg)) \
     903        6 $($(target)_$(source)_TOOL) \
     904        7 $($(target)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
     905        8 $($(target)_$(type)TOOL.$(bld_trg)) \
     906        9 $($(target)_$(type)TOOL) \
     907        10 $($(target)_TOOL.$(bld_trg).$(bld_trg_arch)) \
     908        11 $($(target)_TOOL.$(bld_trg)) \
     909        12 $($(target)_TOOL) \
     910        13 $($(source)_$(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
     911        14 $($(source)_$(type)TOOL.$(bld_trg)) \
     912        15 $($(source)_$(type)TOOL) \
     913        16 $($(source)_TOOL.$(bld_trg).$(bld_trg_arch)) \
     914        17 $($(source)_TOOL.$(bld_trg)) \
     915        18 $($(source)_TOOL) \
     916        19 $($(type)TOOL.$(bld_trg).$(bld_trg_arch)) \
     917        20 $($(type)TOOL.$(bld_trg)) \
     918        21 $($(type)TOOL) \
     919        22 $(TOOL.$(bld_trg).$(bld_trg_arch)) \
     920        23 $(TOOL.$(bld_trg)) \
     921        24 $(TOOL) )
    822922$(error kBuild: TOOL_$(tool)_COMPILE_$(type)_CMDS is not defined. source=$(source) target=$(target) )
    823923endif
    … …  
    843943# C sources
    844944type := C
    845 $(foreach source, $(filter %.c, $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
     945$(foreach source, $(filter %.c             , $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
    846946        ,$(eval $(value def_target_source_c_cpp_asm)) )
    847947
    848948# C++ sources
    849949type := CXX
    850 $(foreach source, $(filter %.cpp %.cxx %.xx, $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
     950$(foreach source, $(filter %.cpp %.cxx %.xx, $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
    851951        ,$(eval $(value def_target_source_c_cpp_asm)) )
    852952
    853953# ASM sources
    854954type := AS
    855 $(foreach source, $(filter %.asm %.s %.S, $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
     955$(foreach source, $(filter %.asm %.s %.S   , $($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)))\
    856956        ,$(eval $(value def_target_source_c_cpp_asm)) )
    857957
    … …  
    9141014PATH_$(target) := $(patsubst %/,%,$(dir $(outbase)))
    9151015suff        := $(firstword\
     1016        $($(target)_LIBSUFF.$(bld_trg).$(bld_trg_arch))\
    9161017        $($(target)_LIBSUFF.$(bld_trg))\
    9171018        $($(target)_LIBSUFF)\
     1019        $(TOOL_$(tool)_ARLIBSUFF.$(bld_trg).$(bld_trg_arch))\
    9181020        $(TOOL_$(tool)_ARLIBSUFF.$(bld_trg))\
    9191021        $(TOOL_$(tool)_ARLIBSUFF)\
    … …  
    9251027        $($(target)_SOURCES.$(bld_trg)) \
    9261028        $($(target)_SOURCES.$(bld_trg_arch)) \
     1029        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
    9271030        $($(target)_SOURCES.$(bld_trg_cpu)) \
    9281031        $($(target)_SOURCES.$(bld_type)))
    … …  
    9411044        $(ARFLAGS.$(bld_type))\
    9421045        $($(target)_ARFLAGS)\
    943         $($(target)_ARFLAGS.$(bld_type))
     1046        $($(target)_ARFLAGS.$(bld_type)) \
     1047        $($(target)_ARFLAGS.$(bld_trg)) \
     1048        $($(target)_ARFLAGS.$(bld_trg_arch)) \
     1049        $($(target)_ARFLAGS.$(bld_trg).$(bld_trg_arch)) \
     1050        $($(target)_ARFLAGS.$(bld_trg_cpu))
    9441051othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm %.o %.obj,\
    9451052        $($(target)_SOURCES) \
    9461053        $($(target)_SOURCES.$(bld_trg)) \
    9471054        $($(target)_SOURCES.$(bld_trg_arch)) \
     1055        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
    9481056        $($(target)_SOURCES.$(bld_trg_cpu)) \
    9491057        $($(target)_SOURCES.$(bld_type)))
    … …  
    9631071ifndef TOOL_$(tool)_LINK_LIBRARY_CMDS
    9641072$(warning kBuild: tools: \
    965         1 $($(target)_$(source)TOOL.$(bld_trg)) \
    966         2 $($(target)_$(source)TOOL) \
    967         3 $($(target)_TOOL.$(bld_trg)) \
    968         4 $($(target)_TOOL) \
    969         5 $($(source)TOOL) \
    970         6 $($(source)TOOL.$(bld_trg)) \
    971         7 $(TOOL.$(bld_trg)) \
    972         8 $(TOOL) )
     1073        1 $($(target)_$(source)TOOL.$(bld_trg).$(bld_trg_arch)) \
     1074        2 $($(target)_$(source)TOOL.$(bld_trg)) \
     1075        3 $($(target)_$(source)TOOL) \
     1076        4 $($(target)_TOOL.$(bld_trg).$(bld_trg_arch)) \
     1077        5 $($(target)_TOOL.$(bld_trg)) \
     1078        6 $($(target)_TOOL) \
     1079        7 $($(source)TOOL) \
     1080        8 $($(source)TOOL.$(bld_trg).$(bld_trg_arch)) \
     1081        9 $($(source)TOOL.$(bld_trg)) \
     1082        10 $(TOOL.$(bld_trg).$(bld_trg_arch)) \
     1083        11 $(TOOL.$(bld_trg)) \
     1084        12 $(TOOL) )
    9731085$(error kBuild: TOOL_$(tool)_LINK_LIBRARY_CMDS isn't defined! target=$(target) )
    9741086endif
    … …  
    9911103# Process libraries
    9921104mode := 0644
    993 $(foreach target, $(LIBRARIES) $(LIBRARIES.$(BUILD_TARGET)), $(eval $(value def_lib)))
     1105$(foreach target, $(LIBRARIES) $(LIBRARIES.$(BUILD_TARGET)) $(LIBRARIES.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(eval $(value def_lib)))
    9941106
    9951107
    … …  
    10261138        $($(target)_SOURCES.$(bld_trg)) \
    10271139        $($(target)_SOURCES.$(bld_trg_arch)) \
     1140        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
    10281141        $($(target)_SOURCES.$(bld_trg_cpu)) \
    10291142        $($(target)_SOURCES.$(bld_type)))
    … …  
    10401153        $(TOOL_$(tool)_LDFLAGS.$(bld_trg))\
    10411154        $(TOOL_$(tool)_LDFLAGS.$(bld_trg_arch))\
     1155        $(TOOL_$(tool)_LDFLAGS.$(bld_trg).$(bld_trg_arch))\
    10421156        $(TOOL_$(tool)_LDFLAGS.$(bld_trg_cpu))\
    10431157        $(LDFLAGS)\
    … …  
    10451159        $(LDFLAGS.$(bld_trg))\
    10461160        $(LDFLAGS.$(bld_trg_arch))\
     1161        $(LDFLAGS.$(bld_trg).$(bld_trg_arch))\
    10471162        $(LDFLAGS.$(bld_trg_cpu))\
    10481163        $($(target)_LDFLAGS)\
    … …  
    10501165        $($(target)_LDFLAGS.$(bld_trg))\
    10511166        $($(target)_LDFLAGS.$(bld_trg_arch))\
     1167        $($(target)_LDFLAGS.$(bld_trg).$(bld_trg_arch))\
    10521168        $($(target)_LDFLAGS.$(bld_trg_cpu))
    10531169othersrc    := $(filter-out %.c %.cpp %.cxx %.cc %.s %.S %.asm %.o %.obj,\
    … …  
    10551171        $($(target)_SOURCES.$(bld_trg)) \
    10561172        $($(target)_SOURCES.$(bld_trg_arch)) \
     1173        $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) \
    10571174        $($(target)_SOURCES.$(bld_trg_cpu)) \
    10581175        $($(target)_SOURCES.$(bld_type)))
    … …  
    10601177libs        :=\
    10611178        $($(target)_LIBS.$(bld_trg_cpu))\
     1179        $($(target)_LIBS.$(bld_trg).$(bld_trg_arch))\
    10621180        $($(target)_LIBS.$(bld_trg_arch))\
    10631181        $($(target)_LIBS.$(bld_trg))\
    … …  
    10651183        $($(target)_LIBS)\
    10661184        $(foreach sdk, $($(target)_SDKS.$(bld_trg)) \
     1185                                   $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
    10671186                                   $($(target)_SDKS.$(bld_type)) \
    10681187                                   $($(target)_SDKS),\
    10691188                $(SDK_$(sdk)_LIBS.$(bld_trg_cpu))\
     1189                $(SDK_$(sdk)_LIBS.$(bld_trg).$(bld_trg_arch))\
    10701190                $(SDK_$(sdk)_LIBS.$(bld_trg_arch))\
    10711191                $(SDK_$(sdk)_LIBS.$(bld_trg))\
    … …  
    10731193                $(SDK_$(sdk)_LIBS))\
    10741194        $(LIBS.$(bld_trg_cpu))\
     1195        $(LIBS.$(bld_trg).$(bld_trg_arch))\
    10751196        $(LIBS.$(bld_trg_arch))\
    10761197        $(LIBS.$(bld_trg))\
    … …  
    10781199        $(LIBS)\
    10791200        $(foreach sdk, $(SDKS.$(bld_trg)) \
     1201                                   $(SDKS.$(bld_trg).$(bld_trg_arch)) \
    10801202                                   $(SDKS.$(bld_type)) \
    10811203                                   $(SDKS),\
    10821204                $(SDK_$(sdk)_LIBS.$(bld_trg_cpu))\
     1205                $(SDK_$(sdk)_LIBS.$(bld_trg).$(bld_trg_arch))\
    10831206                $(SDK_$(sdk)_LIBS.$(bld_trg_arch))\
    10841207                $(SDK_$(sdk)_LIBS.$(bld_trg))\
    … …  
    10861209                $(SDK_$(sdk)_LIBS))\
    10871210        $(TOOL_$(tool)_LIBS.$(bld_trg_cpu))\
     1211        $(TOOL_$(tool)_LIBS.$(bld_trg).$(bld_trg_arch))\
    10881212        $(TOOL_$(tool)_LIBS.$(bld_trg_arch))\
    10891213        $(TOOL_$(tool)_LIBS.$(bld_trg))\
    … …  
    10921216libpath    :=\
    10931217        $($(target)_LIBPATH.$(bld_trg_cpu))\
     1218        $($(target)_LIBPATH.$(bld_trg).$(bld_trg_arch))\
    10941219        $($(target)_LIBPATH.$(bld_trg_arch))\
    10951220        $($(target)_LIBPATH.$(bld_trg))\
    … …  
    10971222        $($(target)_LIBPATH)\
    10981223        $(foreach sdk, $($(target)_SDKS.$(bld_trg)) \
     1224                                   $($(target)_SDKS.$(bld_trg).$(bld_trg_arch)) \
    10991225                                   $($(target)_SDKS.$(bld_type)) \
    11001226                                   $($(target)_SDKS),\
    11011227                $(SDK_$(sdk)_LIBPATH.$(bld_trg_cpu))\
     1228                $(SDK_$(sdk)_LIBPATH.$(bld_trg).$(bld_trg_arch))\
    11021229                $(SDK_$(sdk)_LIBPATH.$(bld_trg_arch))\
    11031230                $(SDK_$(sdk)_LIBPATH.$(bld_trg))\
    … …  
    11051232                $(SDK_$(sdk)_LIBPATH))\
    11061233        $(LIBPATH.$(bld_trg_cpu))\
     1234        $(LIBPATH.$(bld_trg).$(bld_trg_arch))\
    11071235        $(LIBPATH.$(bld_trg_arch))\
    11081236        $(LIBPATH.$(bld_trg))\
    … …  
    11101238        $(LIBPATH)\
    11111239        $(foreach sdk, $(SDKS.$(bld_trg)) \
     1240                                   $(SDKS.$(bld_trg).$(bld_trg_arch)) \
    11121241                                   $(SDKS.$(bld_type)) \
    11131242                                   $(SDKS),\
    11141243                $(SDK_$(sdk)_LIBPATH.$(bld_trg_cpu))\
     1244                $(SDK_$(sdk)_LIBPATH.$(bld_trg).$(bld_trg_arch))\
    11151245                $(SDK_$(sdk)_LIBPATH.$(bld_trg_arch))\
    11161246                $(SDK_$(sdk)_LIBPATH.$(bld_trg))\
    … …  
    11181248                $(SDK_$(sdk)_LIBPATH))\
    11191249        $(TOOL_$(tool)_LIBPATH.$(bld_trg_cpu))\
     1250        $(TOOL_$(tool)_LIBPATH.$(bld_trg).$(bld_trg_arch))\
    11201251        $(TOOL_$(tool)_LIBPATH.$(bld_trg_arch))\
    11211252        $(TOOL_$(tool)_LIBPATH.$(bld_trg))\
    … …  
    11281259## @todo this stuff can't be working.
    11291260custom_pre  := $(strip $(firstword \
     1261        $($(target)_CUSTOM_PRE.$(bld_trg).$(bld_trg_arch))\
    11301262        $($(target)_CUSTOM_PRE.$(bld_trg).$(bld_type))\
    11311263        $($(target)_CUSTOM_PRE.$(bld_trg))\
    11321264        $($(target)_CUSTOM_PRE.$(bld_type))\
    11331265        $($(target)_CUSTOM_PRE)\
     1266        $(CUSTOM_PRE.$(bld_trg).$(bld_trg_arch))\
    11341267        $(CUSTOM_PRE.$(bld_trg).$(bld_type))\
    11351268        $(CUSTOM_PRE.$(bld_trg))\
    … …  
    11381271))
    11391272custom_post    := $(strip $(firstword \
     1273        $($(target)_CUSTOM_POST.$(bld_trg).$(bld_trg_arch))\
    11401274        $($(target)_CUSTOM_POST.$(bld_trg).$(bld_type))\
    11411275        $($(target)_CUSTOM_POST.$(bld_trg))\
    11421276        $($(target)_CUSTOM_POST.$(bld_type))\
    11431277        $($(target)_CUSTOM_POST)\
     1278        $(CUSTOM_POST.$(bld_trg).$(bld_trg_arch))\
    11441279        $(CUSTOM_POST.$(bld_trg).$(bld_type))\
    11451280        $(CUSTOM_POST.$(bld_trg))\
    … …  
    11751310ifndef TOOL_$(tool)_$(tool_do)_CMDS
    11761311$(warning kBuild: tools: \
    1177         1 $($(target)_$(source)TOOL.$(bld_trg)) \
    1178         2 $($(target)_$(source)TOOL) \
    1179         3 $($(target)_TOOL.$(bld_trg)) \
    1180         4 $($(target)_TOOL) \
    1181         5 $($(source)TOOL) \
    1182         6 $($(source)TOOL.$(bld_trg)) \
    1183         7 $(TOOL.$(bld_trg)) \
    1184         8 $(TOOL) )
     1312        1 $($(target)_$(source)TOOL.$(bld_trg).$(bld_trg_arch)) \
     1313        2 $($(target)_$(source)TOOL.$(bld_trg)) \
     1314        3 $($(target)_$(source)TOOL) \
     1315        4 $($(target)_TOOL.$(bld_trg).$(bld_trg_arch)) \
     1316        5 $($(target)_TOOL.$(bld_trg)) \
     1317        6 $($(target)_TOOL) \
     1318        7 $($(source)TOOL.$(bld_trg).$(bld_trg_arch)) \
     1319        8 $($(source)TOOL.$(bld_trg)) \
     1320        9 $($(source)TOOL) \
     1321        10 $(TOOL.$(bld_trg).$(bld_trg_arch)) \
     1322        11 $(TOOL.$(bld_trg)) \
     1323        12 $(TOOL) )
    11851324$(error kBuild: TOOL_$(tool)_$(tool_do)_CMDS isn't defined! target=$(target) )
    11861325endif
    … …  
    12311370mode    := 0755
    12321371bld_trg_base_var := PLATFORM
    1233 $(foreach target, $(BLDPROGS) $(BLDPROGS.$(BUILD_PLATFORM)), $(eval $(value def_bldprog)))
     1372$(foreach target, $(BLDPROGS) $(BLDPROGS.$(BUILD_PLATFORM)) $(BLDPROGS.$(BUILD_PLATFORM).$(BUILD_PLATFORM_ARCH)), $(eval $(value def_bldprog)))
    12341373
    12351374
    … …  
    12471386mode    := 0755
    12481387bld_trg_base_var := TARGET
    1249 $(foreach target, $(DLLS) $(DLLS.$(BUILD_TARGET)), $(eval $(value def_link_common)))
     1388$(foreach target, $(DLLS) $(DLLS.$(BUILD_TARGET)) $(DLLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(eval $(value def_link_common)))
    12501389
    12511390
    … …  
    12551394#   - On OS/2 and windows these are libraries.
    12561395#   - On other platforms they are fake DLLs.
    1257 ifeq ($(filter-out win64 win32 os2,$(BUILD_TARGET)),)
    1258 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)), $(eval $(value def_lib)))
     1396ifeq ($(filter-out nt os2 win win64 win32,$(BUILD_TARGET)),)
     1397$(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(eval $(value def_lib)))
    12591398else
    1260 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)), $(eval $(value def_link_common)))
    1261 endif
    1262 $(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)), \
     1399$(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(eval $(value def_link_common)))
     1400endif
     1401$(foreach target, $(IMPORT_LIBS) $(IMPORT_LIBS.$(BUILD_TARGET)) $(IMPORT_LIBS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
    12631402        $(eval _IMPORT_LIBS += $(if $(INSTARGET_$(target)),$(INSTARGET_$(target)), $(TARGET_$(target)))))
    12641403
    … …  
    12761415mode    := 0755
    12771416bld_trg_base_var := TARGET
    1278 $(foreach target, $(PROGRAMS) $(PROGRAMS.$(BUILD_TARGET)), $(eval $(value def_link_common)))
     1417$(foreach target, $(PROGRAMS) $(PROGRAMS.$(BUILD_TARGET)) $(PROGRAMS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(eval $(value def_link_common)))
    12791418
    12801419
    … …  
    12921431mode    := 0644
    12931432bld_trg_base_var := TARGET
    1294 $(foreach target, $(SYSMODS) $(SYSMODS.$(BUILD_TARGET)), $(eval $(value def_link_common)))
     1433$(foreach target, $(SYSMODS) $(SYSMODS.$(BUILD_TARGET)) $(SYSMODS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), $(eval $(value def_link_common)))
    12951434
    12961435
    … …  
    12981437# OTHERS
    12991438#
    1300 _OTHERS = $(OTHERS) $(OTHERS.$(BUILD_TARGET))
     1439_OTHERS = $(OTHERS) $(OTHERS.$(BUILD_TARGET)) $(OTHERS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
    13011440
    13021441
    … …  
    13501489# mode, uid and gid
    13511490mode := $(firstword \
     1491        $($(target)_$(srcsrc)_MODE.$(bld_trg).$(bld_trg_arch)) \
    13521492        $($(target)_$(srcsrc)_MODE.$(bld_trg)) \
    13531493        $($(target)_$(srcsrc)_MODE) \
     1494        $($(target)_$(srcdst)_MODE.$(bld_trg).$(bld_trg_arch)) \
    13541495        $($(target)_$(srcdst)_MODE.$(bld_trg)) \
    13551496        $($(target)_$(srcdst)_MODE) \
     1497        $($(srcsrc)_MODE.$(bld_trg).$(bld_trg_arch)) \
    13561498        $($(srcsrc)_MODE.$(bld_trg)) \
    13571499        $($(srcsrc)_MODE) \
     1500        $($(srcdst)_MODE.$(bld_trg).$(bld_trg_arch)) \
    13581501        $($(srcdst)_MODE.$(bld_trg)) \
    13591502        $($(srcdst)_MODE) \
     1503        $($(target)_MODE.$(bld_trg).$(bld_trg_arch)) \
    13601504        $($(target)_MODE.$(bld_trg)) \
    13611505        $($(target)_MODE))
    13621506uid := $(firstword \
     1507        $($(target)_$(srcsrc)_UID.$(bld_trg).$(bld_trg_arch)) \
    13631508        $($(target)_$(srcsrc)_UID.$(bld_trg)) \
    13641509        $($(target)_$(srcsrc)_UID) \
     1510        $($(target)_$(srcdst)_UID.$(bld_trg).$(bld_trg_arch)) \
    13651511        $($(target)_$(srcdst)_UID.$(bld_trg)) \
    13661512        $($(target)_$(srcdst)_UID) \
     1513        $($(srcsrc)_UID.$(bld_trg).$(bld_trg_arch)) \
    13671514        $($(srcsrc)_UID.$(bld_trg)) \
    13681515        $($(srcsrc)_UID) \
     1516        $($(srcdst)_UID.$(bld_trg).$(bld_trg_arch)) \
    13691517        $($(srcdst)_UID.$(bld_trg)) \
    13701518        $($(srcdst)_UID) \
     1519        $($(target)_UID.$(bld_trg).$(bld_trg_arch)) \
    13711520        $($(target)_UID.$(bld_trg)) \
    13721521        $($(target)_UID))
    13731522gid := $(firstword \
     1523        $($(target)_$(srcsrc)_GID.$(bld_trg).$(bld_trg_arch)) \
    13741524        $($(target)_$(srcsrc)_GID.$(bld_trg)) \
    13751525        $($(target)_$(srcsrc)_GID) \
     1526        $($(target)_$(srcdst)_GID.$(bld_trg).$(bld_trg_arch)) \
    13761527        $($(target)_$(srcdst)_GID.$(bld_trg)) \
    13771528        $($(target)_$(srcdst)_GID) \
     1529        $($(srcsrc)_GID.$(bld_trg).$(bld_trg_arch)) \
    13781530        $($(srcsrc)_GID.$(bld_trg)) \
    13791531        $($(srcsrc)_GID) \
     1532        $($(srcdst)_GID.$(bld_trg).$(bld_trg_arch)) \
    13801533        $($(srcdst)_GID.$(bld_trg)) \
    13811534        $($(srcdst)_GID) \
     1535        $($(target)_GID.$(bld_trg).$(bld_trg_arch)) \
    13821536        $($(target)_GID.$(bld_trg)) \
    13831537        $($(target)_GID))
    … …  
    14831637
    14841638mode := $(firstword \
     1639        $($(target)_$(directory)_MODE.$(bld_trg).$(bld_trg_arch)) \
    14851640        $($(target)_$(directory)_MODE.$(bld_trg)) \
    14861641        $($(target)_$(directory)_MODE) \
     1642        $($(directory)_MODE.$(bld_trg).$(bld_trg_arch)) \
    14871643        $($(directory)_MODE.$(bld_trg)) \
    14881644        $($(directory)_MODE) \
     1645        $($(target)_MODE.$(bld_trg).$(bld_trg_arch)) \
    14891646        $($(target)_MODE.$(bld_trg)) \
    14901647        $($(target)_MODE))
    14911648uid := $(firstword \
     1649        $($(target)_$(directory)_UID.$(bld_trg).$(bld_trg_arch)) \
    14921650        $($(target)_$(directory)_UID.$(bld_trg)) \
    14931651        $($(target)_$(directory)_UID) \
     1652        $($(directory)_UID.$(bld_trg).$(bld_trg_arch)) \
    14941653        $($(directory)_UID.$(bld_trg)) \
    14951654        $($(directory)_UID) \
     1655        $($(target)_UID.$(bld_trg).$(bld_trg_arch)) \
    14961656        $($(target)_UID.$(bld_trg)) \
    14971657        $($(target)_UID))
    14981658gid := $(firstword \
     1659        $($(target)_$(directory)_GID.$(bld_trg).$(bld_trg_arch)) \
    14991660        $($(target)_$(directory)_GID.$(bld_trg)) \
    15001661        $($(target)_$(directory)_GID) \
     1662        $($(directory)_GID.$(bld_trg).$(bld_trg_arch)) \
    15011663        $($(directory)_GID.$(bld_trg)) \
    15021664        $($(directory)_GID) \
     1665        $($(target)_GID.$(bld_trg).$(bld_trg_arch)) \
    15031666        $($(target)_GID.$(bld_trg)) \
    15041667        $($(target)_GID))
    … …  
    15241687INSTARGET_DIRS_$(target) :=
    15251688
    1526 $(foreach directory,$($(target)_DIRS) $($(target)_DIRS.$(bld_trg)) $($(target)_DIRS.$(bld_trg_arch)) $($(target)_DIRS.$(bld_trg_cpu)) $($(target)_DIRS.$(bld_type)), \
     1689$(foreach directory,$($(target)_DIRS) $($(target)_DIRS.$(bld_trg)) $($(target)_DIRS.$(bld_trg).$(bld_trg_arch)) $($(target)_DIRS.$(bld_trg_arch)) $($(target)_DIRS.$(bld_trg_cpu)) $($(target)_DIRS.$(bld_type)), \
    15271690        $(eval $(value def_install_directory)))
    15281691
    1529 $(foreach src,$($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)), \
     1692$(foreach src,$($(target)_SOURCES) $($(target)_SOURCES.$(bld_trg)) $($(target)_SOURCES.$(bld_trg).$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_arch)) $($(target)_SOURCES.$(bld_trg_cpu)) $($(target)_SOURCES.$(bld_type)), \
    15301693        $(eval $(value def_install_src)))
    15311694
    1532 $(foreach src,$($(target)_SYMLINKS) $($(target)_SYMLINKS.$(bld_trg)) $($(target)_SYMLINKS.$(bld_trg_arch)) $($(target)_SYMLINKS.$(bld_trg_cpu)) $($(target)_SYMLINKS.$(bld_type)), \
     1695$(foreach src,$($(target)_SYMLINKS) $($(target)_SYMLINKS.$(bld_trg)) $($(target)_SYMLINKS.$(bld_trg).$(bld_trg_arch)) $($(target)_SYMLINKS.$(bld_trg_arch)) $($(target)_SYMLINKS.$(bld_trg_cpu)) $($(target)_SYMLINKS.$(bld_type)), \
    15331696        $(eval $(value def_install_symlink)))
    15341697
    … …  
    15381701
    15391702## process all install targets
    1540 $(foreach target, $(INSTALLS) $(INSTALLS.$(BUILD_TARGET)), \
     1703$(foreach target, $(INSTALLS) $(INSTALLS.$(BUILD_TARGET)) $(INSTALLS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)), \
    15411704        $(eval $(value def_install)))
    15421705
    … …  
    15451708# PACKING
    15461709#
    1547 _PACKING += $(PACKING) $(PACKING.$(BUILD_TARGET))
     1710_PACKING += $(PACKING) $(PACKING.$(BUILD_TARGET)) $(PACKING.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))
    15481711
    15491712
    … …  
    16111774# @param        $(PASS)         Uppercase pass name.
    16121775define def_pass_old
    1613 $(eval SUBDIRS_$(PASS)          ?= $(SUBDIRS)          $(SUBDIRS.$(BUILD_TARGET)))
    1614 $(eval SUBDIRS_AFTER_$(PASS)    ?= $(SUBDIRS_AFTER)    $(SUBDIRS_AFTER.$(BUILD_TARGET)))
    1615 $(eval MAKEFILES_BEFORE_$(PASS) ?= $(MAKEFILES_BEFORE) $(MAKEFILES_BEFORE.$(BUILD_TARGET)))
    1616 $(eval MAKEFILES_AFTER_$(PASS)  ?= $(MAKEFILES_AFTER)  $(MAKEFILES_AFTER.$(BUILD_TARGET)))
     1776$(eval SUBDIRS_$(PASS)          ?= $(SUBDIRS)          $(SUBDIRS.$(BUILD_TARGET))           $(SUBDIRS.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))          )
     1777$(eval SUBDIRS_AFTER_$(PASS)    ?= $(SUBDIRS_AFTER)    $(SUBDIRS_AFTER.$(BUILD_TARGET))     $(SUBDIRS_AFTER.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))    )
     1778$(eval MAKEFILES_BEFORE_$(PASS) ?= $(MAKEFILES_BEFORE) $(MAKEFILES_BEFORE.$(BUILD_TARGET))  $(MAKEFILES_BEFORE.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) )
     1779$(eval MAKEFILES_AFTER_$(PASS)  ?= $(MAKEFILES_AFTER)  $(MAKEFILES_AFTER.$(BUILD_TARGET))   $(MAKEFILES_AFTER.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))  )
    16171780
    16181781$(eval tag:=_before)
    16191782$(eval dep:=)
    1620 $(foreach subdir,$(SUBDIRS_$(PASS))            $(SUBDIRS_$(PASS).$(BUILD_TARGET))         ,$(eval $(def_pass_subdir)))
    1621 $(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET)),$(eval $(def_pass_makefile)))
     1783$(foreach subdir,$(SUBDIRS_$(PASS))            $(SUBDIRS_$(PASS).$(BUILD_TARGET))           $(SUBDIRS_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH))         ,$(eval $(def_pass_subdir)))
     1784$(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET))  $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),$(eval $(def_pass_makefile)))
    16221785
    16231786$(eval tag:=_after)
    16241787$(eval dep:=pass_$(pass)_doit)
    1625 $(foreach subdir,$(SUBDIRS_AFTER_$(PASS))      $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET))   ,$(eval $(def_pass_subdir)))
    1626 $(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET)) ,$(eval $(def_pass_makefile)))
     1788$(foreach subdir,$(SUBDIRS_AFTER_$(PASS))      $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET))     $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH))   ,$(eval $(def_pass_subdir)))
     1789$(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET))   $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) ,$(eval $(def_pass_makefile)))
    16271790
    16281791.NOTPARALLEL: pass_$(pass)_before pass_$(pass)_after
    … …  
    16371800
    16381801define def_pass
    1639 $(eval SUBDIRS_$(PASS)          ?= $(SUBDIRS)          $(SUBDIRS.$(BUILD_TARGET)))
    1640 $(eval SUBDIRS_AFTER_$(PASS)    ?= $(SUBDIRS_AFTER)    $(SUBDIRS_AFTER.$(BUILD_TARGET)))
    1641 $(eval MAKEFILES_BEFORE_$(PASS) ?= $(MAKEFILES_BEFORE) $(MAKEFILES_BEFORE.$(BUILD_TARGET)))
    1642 $(eval MAKEFILES_AFTER_$(PASS)  ?= $(MAKEFILES_AFTER)  $(MAKEFILES_AFTER.$(BUILD_TARGET)))
     1802$(eval SUBDIRS_$(PASS)          ?= $(SUBDIRS)          $(SUBDIRS.$(BUILD_TARGET))          $(SUBDIRS.$(BUILD_TARGET.$(BUILD_TARGET_ARCH)))          )
     1803$(eval SUBDIRS_AFTER_$(PASS)    ?= $(SUBDIRS_AFTER)    $(SUBDIRS_AFTER.$(BUILD_TARGET))    $(SUBDIRS_AFTER.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))    )
     1804$(eval MAKEFILES_BEFORE_$(PASS) ?= $(MAKEFILES_BEFORE) $(MAKEFILES_BEFORE.$(BUILD_TARGET)) $(MAKEFILES_BEFORE.$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) )
     1805$(eval MAKEFILES_AFTER_$(PASS)  ?= $(MAKEFILES_AFTER)  $(MAKEFILES_AFTER.$(BUILD_TARGET))  $(MAKEFILES_AFTER.$(BUILD_TARGET).$(BUILD_TARGET_ARCH))  )
    16431806
    16441807$(eval tag:=_before)
    16451808$(eval dep:=)
    1646 $(foreach subdir,$(SUBDIRS_$(PASS))            $(SUBDIRS_$(PASS).$(BUILD_TARGET))         ,$(eval $(def_pass_subdir)))
    1647 $(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET)),$(eval $(def_pass_makefile)))
     1809$(foreach subdir,$(SUBDIRS_$(PASS))            $(SUBDIRS_$(PASS).$(BUILD_TARGET))          $(SUBDIRS_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH))         ,$(eval $(def_pass_subdir)))
     1810$(foreach makefile,$(MAKEFILES_BEFORE_$(PASS)) $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET)) $(MAKEFILES_BEFORE_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH)),$(eval $(def_pass_makefile)))
    16481811
    16491812$(eval tag:=_after)
    16501813$(eval dep:=pass_$(pass)_doit)
    1651 $(foreach subdir,$(SUBDIRS_AFTER_$(PASS))      $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET))   ,$(eval $(def_pass_subdir)))
    1652 $(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET)) ,$(eval $(def_pass_makefile)))
     1814$(foreach subdir,$(SUBDIRS_AFTER_$(PASS))      $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET))    $(SUBDIRS_AFTER_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH))   ,$(eval $(def_pass_subdir)))
     1815$(foreach makefile,$(MAKEFILES_AFTER_$(PASS))  $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET))  $(MAKEFILES_AFTER_$(PASS).$(BUILD_TARGET).$(BUILD_TARGET_ARCH)) ,$(eval $(def_pass_makefile)))
    16531816
    16541817ifdef KBUILD_SAFE_PARALLEL
Note: See TracChangeset for help on using the changeset viewer.