VirtualBox

Changeset 1502 in kBuild


Ignore:
Timestamp:
Apr 8, 2008 12:23:15 AM (17 years ago)
Author:
bird
Message:

Fixed a NO_COMPILE_CMDS_DEPS / NO_LINK_CMDS_DEPS mixup. Drop commented out debug $(warnings ) in the inherit code to gain speed.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/kBuild/footer.kmk

    r1496 r1502  
    570570   ifneq ($($(src)_EXTENDS_STATUS_),42)
    571571    # 'foreach' will create 'trg' in a new variable context hiding
    572         # out current variable. 'src' OTOH will be overwritten.
    573     #$ (warning def_inherit: recursing into $(src) from $(trg))
     572    # out current variable. 'src' OTOH will be overwritten.
    574573    $(foreach trg, $(src), $(evalval def_inherit))
    575574    local src := $(src_prefix)$(strip $($(trg)_EXTENDS))
     
    916915ifndef $(target)_$(prop)
    917916$(target)_$(prop) := $(TEMPLATE_$($(target)_TEMPLATE)_$(prop))
    918 #$ (warning dbgtarget: $(target)_$(prop):='$(value $(target)_$(prop))' TEMPLATE_$($(target)_TEMPLATE)_$(prop))
    919917endif
    920918endif
    921919ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)
    922920ifndef $(target)_$(prop).$(bld_trg)
    923 #$ (warning dbgsource: $(target)_$(prop).$(bld_trg)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    924921$(target)_$(prop).$(bld_trg) := $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    925922endif
     
    927924ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)
    928925ifndef $(target)_$(prop).$(bld_trg).$(bld_trg_arch)
    929 #$ (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))
    930926$(target)_$(prop).$(bld_trg).$(bld_trg_arch) := $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
    931927endif
     
    933929ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch)
    934930ifndef $(target)_$(prop).$(bld_trg_arch)
    935 #$ (warning dbgsource: $(target)_$(prop).$(bld_trg_arch)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch))
    936931$(target)_$(prop).$(bld_trg_arch) := $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch))
    937932endif
     
    939934ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu)
    940935ifndef $(target)_$(prop).$(bld_trg_cpu)
    941 #$ (warning dbgsource: $(target)_$(prop).$(bld_trg_cpu)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    942936$(target)_$(prop).$(bld_trg_cpu) := $(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    943937endif
     
    954948ifndef $(target)_$(prop)
    955949$(target)_$(prop) = $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop))
    956 #$ (warning dbgtarget: $(target)_$(prop):='$(value $(target)_$(prop))' TEMPLATE_$($(target)_TEMPLATE)_$(prop))
    957950endif
    958951endif
    959952ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)
    960953ifndef $(target)_$(prop).$(bld_trg)
    961 #$ (warning dbgsource: $(target)_$(prop).$(bld_trg)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    962954$(target)_$(prop).$(bld_trg) = $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    963955endif
     
    965957ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)
    966958ifndef $(target)_$(prop).$(bld_trg).$(bld_trg_arch)
    967 #$ (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))
    968959$(target)_$(prop).$(bld_trg).$(bld_trg_arch) = $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
    969960endif
     
    971962ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch)
    972963ifndef $(target)_$(prop).$(bld_trg_arch)
    973 #$ (warning dbgsource: $(target)_$(prop).$(bld_trg_arch)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch))
    974964$(target)_$(prop).$(bld_trg_arch) = $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch))
    975965endif
     
    977967ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu)
    978968ifndef $(target)_$(prop).$(bld_trg_cpu)
    979 #$ (warning dbgsource: $(target)_$(prop).$(bld_trg_cpu)="TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu)" TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    980969$(target)_$(prop).$(bld_trg_cpu) = $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    981970endif
     
    988977define def_inherit_template_one_accumulate_l
    989978ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop)
    990 #$ (warning dbgtype: TEMPLATE_$($(target)_TEMPLATE)_$(prop) $(target)_$(prop)=$($(target)_$(prop)) $(TEMPLATE_$($(target)_TEMPLATE)_$(prop)))
    991979$(target)_$(prop) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop))
    992 #$ (warning dbgtype: $(target)_$(prop)=$($(target)_$(prop)))
    993980endif
    994981ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE)
    995 #$ (warning dbg4: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
    996982$(target)_$(prop).$(BUILD_TYPE) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
    997983endif
    998984ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)
    999 #$ (warning dbg5: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    1000985$(target)_$(prop).$(bld_trg) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    1001986endif
    1002987ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)
    1003 #$ (warning dbg4: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
    1004988$(target)_$(prop).$(bld_trg).$(bld_trg_arch) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
    1005989endif
    1006990ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu)
    1007 #$ (warning dbg5: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    1008991$(target)_$(prop).$(bld_trg_cpu) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    1009992endif
    1010993ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch)
    1011 #$ (warning dbg6: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch))
    1012994$(target)_$(prop).$(bld_trg_arch) += $$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch))
    1013995endif
     
    10191001define def_inherit_template_one_accumulate_r
    10201002ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop)
    1021 #$ (warning dbgtype: TEMPLATE_$($(target)_TEMPLATE)_$(prop) $(target)_$(prop)=$($(target)_$(prop)) $(TEMPLATE_$($(target)_TEMPLATE)_$(prop)))
    10221003$(target)_$(prop) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop))
    1023 #$ (warning dbgtype: $(target)_$(prop)=$($(target)_$(prop)))
    10241004endif
    10251005ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE)
    1026 #$ (warning dbg4: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
    10271006$(target)_$(prop).$(BUILD_TYPE) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(BUILD_TYPE))
    10281007endif
    10291008ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg)
    1030 #$ (warning dbg5: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    10311009$(target)_$(prop).$(bld_trg) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg))
    10321010endif
    10331011ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch)
    1034 #$ (warning dbg4: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
    10351012$(target)_$(prop).$(bld_trg).$(bld_trg_arch) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg).$(bld_trg_arch))
    10361013endif
    10371014ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu)
    1038 #$ (warning dbg5: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    10391015$(target)_$(prop).$(bld_trg_cpu) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_cpu))
    10401016endif
    10411017ifdef TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch)
    1042 #$ (warning dbg6: TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch))
    10431018$(target)_$(prop).$(bld_trg_arch) <=$$(TEMPLATE_$($(target)_TEMPLATE)_$(prop).$(bld_trg_arch))
    10441019endif
     
    19091884
    19101885## wrapper the link command dependency check.
    1911 ifndef NO_COMPILE_CMDS_DEPS
     1886ifndef NO_LINK_CMDS_DEPS
    19121887 _DEP_LINK_CMDS = $$(comp-cmds-ex $$($(target)_CMDS_PREV_),$$(commands $(out)),FORCE)
    19131888else
     
    20071982local src_handler := $(firstword $(filter $(suff):%, $($(target)_$(source)_SRC_HANDLERS) $($(source)_SRC_HANDLERS) $(target_src_handlers) ))
    20081983local handler := $(patsubst $(suff):%,%,$(src_handler))
    2009 #$ (warning def_src_handler_one: source=$(source) suff=$(suff) src_handler=$(src_handler) handler=$(handler))
    20101984ifneq ($(handler),)
    20111985 $(evalval $(handler))
Note: See TracChangeset for help on using the changeset viewer.

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