Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Prevent top-level submodule build targets from running in parallel; reduce phantom dependency invalidation; don't touch submodule dummy file unless it successfully built.

Browse source
This commit is contained in:
Brian J. Burg 2012-10-04 19:26:29 -07:00
parent 1c42849932
commit 3a5d9bdae2
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Makefile.in
View file

@ -102,33 +102,30 @@ ENV_RFLAGS_$(1) = RUSTFLAGS="$$(strip $$(CFG_RUSTC_FLAGS)) $$(addprefix -L $$(B)
# whenever a submodule changes # whenever a submodule changes
# TODO: this may be a bit brutish, but is there a better way? # TODO: this may be a bit brutish, but is there a better way?
ROUGH_DEPS_$(1)=$$(call rwildcard,$$(S)src/$(1),*h *c *cpp *rs *rc) ROUGH_DEPS_$(1)=$$(call rwildcard,$$(S)src/$(1),*h *c *cpp *rs *rc)
DONE_DEPS_$(1)=$$(foreach dep,$$(DEPS_$(1)),$$(DONE_$$(dep)))
# the main target for a submodule # the main target for a submodule
# -- # --
# this depends on the phony command, which enforces an ordering between parallel $$(DONE_$(1)) : $$(DONE_DEPS_$(1)) $$(ROUGH_DEPS_$(1))
# recursive makes, but causes the phony command to always run whether or not
# anything has actually changes.
$$(DONE_$(1)) : $$(DEPS_$(1)) $$(ROUGH_DEPS_$(1))
# @$$(call E, make: $(1)) # @$$(call E, make: $(1))
# @$$(call E, $(1) deps= $$(DEPS_$(1))) # @$$(call E, $(1) deps= $$(DEPS_$(1)))
# @$$(call E, $(1) done_deps= $$(DONE_DEPS_$(1)))
# @$$(call E, $(1) cflags= $$(ENV_CFLAGS_$(1))) # @$$(call E, $(1) cflags= $$(ENV_CFLAGS_$(1)))
# @$$(call E, $(1) rflags= $$(ENV_RFLAGS_$(1))) # @$$(call E, $(1) rflags= $$(ENV_RFLAGS_$(1)))
$$(Q) \ $$(Q) \
$$(ENV_CFLAGS_$(1)) \ $$(ENV_CFLAGS_$(1)) \
$$(ENV_RFLAGS_$(1)) \ $$(ENV_RFLAGS_$(1)) \
$$(MAKE) -C $$(B)src/$(1) $$(MAKE) -C $$(B)src/$(1) && touch $$(DONE_$(1))
$$(Q)touch $$(DONE_$(1))
# main submodule target # main submodule target
$(1) : $$(DEPS_$(1)) $$(DONE_$(1)) $(1) : $$(DONE_$(1))
.PHONY : $(1)
.NOTPARALLEL : $(1)
endef endef
$(foreach submodule,$(CFG_SUBMODULES),\ $(foreach submodule,$(CFG_SUBMODULES),\
$(eval $(call DEF_SUBMODULE_RULES,$(submodule)))) $(eval $(call DEF_SUBMODULE_RULES,$(submodule))))
.PHONY : $(1) $(DEPS_SUBMODULES)
RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) RFLAGS_servo = $(strip $(CFG_RUSTC_FLAGS)) $(addprefix -L $(B)src/,$(DEPS_SUBMODULES))
SRC_servo = $(call rwildcard,$(S)src/servo/,*.rs) SRC_servo = $(call rwildcard,$(S)src/servo/,*.rs)
CRATE_servo = $(S)src/servo/servo.rc CRATE_servo = $(S)src/servo/servo.rc