VirtualBox

Changeset 1702 in kBuild


Ignore:
Timestamp:
Sep 2, 2008 2:20:48 AM (17 years ago)
Author:
bird
Message:

kBuild: Implemented the new LNK_DEPS and LNK_ORDERDEPS link target properties. These are 'workarounds' around the funny workings of DEPS and ORDERDEPS on link targets (legacy we cannot get rid of).

Location:
trunk/kBuild
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/footer.kmk

    r1697 r1702  
    22372237        $($(target)_ARFLAGS.$(bld_trg_cpu))
    22382238local dirdep      := $(call DIRDEP,$(dir $(out)))
    2239 local deps        := $($(target)_DEPS)
    2240 local orderdeps   := $($(target)_ORDERDEPS)
     2239local deps        := \
     2240        $($(target)_DEPS.$(bld_trg_cpu)) \
     2241        $($(target)_DEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
     2242        $($(target)_DEPS.$(bld_trg).$(bld_trg_arch)) \
     2243        $($(target)_DEPS.$(bld_trg).$(bld_type)) \
     2244        $($(target)_DEPS.$(bld_trg_arch)) \
     2245        $($(target)_DEPS.$(bld_trg)) \
     2246        $($(target)_DEPS.$(bld_type)) \
     2247        $($(target)_DEPS) \
     2248        $($(target)_LNK_DEPS.$(bld_trg_cpu)) \
     2249        $($(target)_LNK_DEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
     2250        $($(target)_LNK_DEPS.$(bld_trg).$(bld_trg_arch)) \
     2251        $($(target)_LNK_DEPS.$(bld_trg).$(bld_type)) \
     2252        $($(target)_LNK_DEPS.$(bld_trg_arch)) \
     2253        $($(target)_LNK_DEPS.$(bld_trg)) \
     2254        $($(target)_LNK_DEPS.$(bld_type)) \
     2255        $($(target)_LNK_DEPS)
     2256local orderdeps   := \
     2257        $($(target)_ORDERDEPS.$(bld_trg_cpu)) \
     2258        $($(target)_ORDERDEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
     2259        $($(target)_ORDERDEPS.$(bld_trg).$(bld_trg_arch)) \
     2260        $($(target)_ORDERDEPS.$(bld_trg).$(bld_type)) \
     2261        $($(target)_ORDERDEPS.$(bld_trg_arch)) \
     2262        $($(target)_ORDERDEPS.$(bld_trg)) \
     2263        $($(target)_ORDERDEPS.$(bld_type)) \
     2264        $($(target)_ORDERDEPS) \
     2265        $($(target)_LNK_ORDERDEPS.$(bld_trg_cpu)) \
     2266        $($(target)_LNK_ORDERDEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
     2267        $($(target)_LNK_ORDERDEPS.$(bld_trg).$(bld_trg_arch)) \
     2268        $($(target)_LNK_ORDERDEPS.$(bld_trg).$(bld_type)) \
     2269        $($(target)_LNK_ORDERDEPS.$(bld_trg_arch)) \
     2270        $($(target)_LNK_ORDERDEPS.$(bld_trg)) \
     2271        $($(target)_LNK_ORDERDEPS.$(bld_type)) \
     2272        $($(target)_LNK_ORDERDEPS)
    22412273
    22422274# Adjust paths if we got a default path.
    … …  
    22502282
    22512283# Custom pre-link actions.
     2284## @todo bld_trg_cpu is missing here.
    22522285ifdef $(target)_PRE_CMDS.$(bld_trg).$(bld_trg_arch).$(bld_type)
    22532286 local pre_cmds := $($(target)_PRE_CMDS.$(bld_trg).$(bld_trg_arch).$(bld_type))
    … …  
    25642597        $(TOOL_$(tool)_LIBPATH)
    25652598local dirdep      := $(call DIRDEP,$(dir $(out)))
    2566 local deps        := $($(target)_DEPS)
    2567 local orderdeps   := $($(target)_ORDERDEPS)
     2599local deps        := \
     2600        $($(target)_DEPS.$(bld_trg_cpu)) \
     2601        $($(target)_DEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
     2602        $($(target)_DEPS.$(bld_trg).$(bld_trg_arch)) \
     2603        $($(target)_DEPS.$(bld_trg).$(bld_type)) \
     2604        $($(target)_DEPS.$(bld_trg_arch)) \
     2605        $($(target)_DEPS.$(bld_trg)) \
     2606        $($(target)_DEPS.$(bld_type)) \
     2607        $($(target)_DEPS) \
     2608        $($(target)_LNK_DEPS.$(bld_trg_cpu)) \
     2609        $($(target)_LNK_DEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
     2610        $($(target)_LNK_DEPS.$(bld_trg).$(bld_trg_arch)) \
     2611        $($(target)_LNK_DEPS.$(bld_trg).$(bld_type)) \
     2612        $($(target)_LNK_DEPS.$(bld_trg_arch)) \
     2613        $($(target)_LNK_DEPS.$(bld_trg)) \
     2614        $($(target)_LNK_DEPS.$(bld_type)) \
     2615        $($(target)_LNK_DEPS)
     2616local orderdeps   := \
     2617        $($(target)_ORDERDEPS.$(bld_trg_cpu)) \
     2618        $($(target)_ORDERDEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
     2619        $($(target)_ORDERDEPS.$(bld_trg).$(bld_trg_arch)) \
     2620        $($(target)_ORDERDEPS.$(bld_trg).$(bld_type)) \
     2621        $($(target)_ORDERDEPS.$(bld_trg_arch)) \
     2622        $($(target)_ORDERDEPS.$(bld_trg)) \
     2623        $($(target)_ORDERDEPS.$(bld_type)) \
     2624        $($(target)_ORDERDEPS) \
     2625        $($(target)_LNK_ORDERDEPS.$(bld_trg_cpu)) \
     2626        $($(target)_LNK_ORDERDEPS.$(bld_trg).$(bld_trg_arch).$(bld_type)) \
     2627        $($(target)_LNK_ORDERDEPS.$(bld_trg).$(bld_trg_arch)) \
     2628        $($(target)_LNK_ORDERDEPS.$(bld_trg).$(bld_type)) \
     2629        $($(target)_LNK_ORDERDEPS.$(bld_trg_arch)) \
     2630        $($(target)_LNK_ORDERDEPS.$(bld_trg)) \
     2631        $($(target)_LNK_ORDERDEPS.$(bld_type)) \
     2632        $($(target)_LNK_ORDERDEPS)
    25682633
    25692634# Adjust paths if we got a default path.

  • trunk/kBuild/header.kmk

    r1692 r1702  
    721721# will do the necessary inheritance from templates to targets.
    722722PROPS_ACCUMULATE_R := \
    723         DEPS ORDERDEPS DEFS \
     723        DEPS LNK_DEPS ORDERDEPS LNK_ORDERDEPS DEFS \
    724724        ARFLAGS \
    725725        CFLAGS CDEFS \
    … …  
    734734# Subset of PROPS_ACCUMULATE_R which applies to all linkable targets.
    735735PROPS_ACCUMULATE_R_LNK := \
    736         DEPS ORDERDEPS DEFS \
     736        DEPS LNK_DEPS ORDERDEPS LNK_ORDERDEPS DEFS \
    737737        CFLAGS CDEFS \
    738738        CXXFLAGS CXXDEFS \
Note: See TracChangeset for help on using the changeset viewer.

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