author | Jason Orendorff <jorendorff@mozilla.com> |
Wed, 17 Aug 2011 11:21:46 -0500 | |
changeset 75424 | c5e84e1e62daf3e196e1aadcba60c89ea75f3c3a |
parent 75423 | 5f0596a0b81e10538e29f084a5525825b8dd4229 |
child 75425 | 8e85ef78e47f901e48a4efc9099b3dfab7feaad2 |
push id | 21023 |
push user | mak77@bonardo.net |
push date | Thu, 18 Aug 2011 09:39:20 +0000 |
treeherder | mozilla-central@f69a10f23bf3 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted |
milestone | 9.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
config/rules.mk | file | annotate | diff | comparison | revisions | |
js/src/config/rules.mk | file | annotate | diff | comparison | revisions |
--- a/config/rules.mk +++ b/config/rules.mk @@ -428,17 +428,17 @@ ifdef MOZ_UPDATE_XTERM # Its good not to have a newline at the end of the titlebar string because it # makes the make -s output easier to read. Echo -n does not work on all # platforms, but we can trick sed into doing it. UPDATE_TITLE = sed -e "s!Y!$(1) in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$(2)!" $(MOZILLA_DIR)/config/xterm.str; endif define SUBMAKE # $(call SUBMAKE,target,directory) +@$(UPDATE_TITLE) -+@$(MAKE) $(if $(2),-C $(2)) $(1) ++$(MAKE) $(if $(2),-C $(2)) $(1) endef # The extra line is important here! don't delete it ifneq (,$(strip $(DIRS))) LOOP_OVER_DIRS = \ $(foreach dir,$(DIRS),$(call SUBMAKE,$@,$(dir))) endif
--- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -428,17 +428,17 @@ ifdef MOZ_UPDATE_XTERM # Its good not to have a newline at the end of the titlebar string because it # makes the make -s output easier to read. Echo -n does not work on all # platforms, but we can trick sed into doing it. UPDATE_TITLE = sed -e "s!Y!$(1) in $(shell $(BUILD_TOOLS)/print-depth-path.sh)/$(2)!" $(MOZILLA_DIR)/config/xterm.str; endif define SUBMAKE # $(call SUBMAKE,target,directory) +@$(UPDATE_TITLE) -+@$(MAKE) $(if $(2),-C $(2)) $(1) ++$(MAKE) $(if $(2),-C $(2)) $(1) endef # The extra line is important here! don't delete it ifneq (,$(strip $(DIRS))) LOOP_OVER_DIRS = \ $(foreach dir,$(DIRS),$(call SUBMAKE,$@,$(dir))) endif