author | Mike Hommey <mh+mozilla@glandium.org> |
Fri, 04 Apr 2014 14:57:36 +0900 | |
changeset 177073 | cf2c03bddca6e2ae4d6dd9ee8630a817e193518e |
parent 177072 | 3f31b2d41649a3530ee255cfb85a1db5252cb014 |
child 177074 | 386862bbda8d69db44a805b8f0ad328c652e2902 |
push id | 26541 |
push user | ryanvm@gmail.com |
push date | Fri, 04 Apr 2014 18:50:44 +0000 |
treeherder | mozilla-central@2a069087bed1 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | mshal |
bugs | 991976 |
milestone | 31.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
|
--- a/client.mk +++ b/client.mk @@ -204,17 +204,17 @@ ifdef WANT_MOZCONFIG_MK # For now, only output "export" lines from mozconfig2client-mk output. MOZCONFIG_MK_LINES := $(filter export||%,$(MOZCONFIG_OUT_LINES)) $(OBJDIR)/.mozconfig.mk: $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR)) $(OBJDIR)/CLOBBER $(if $(MOZCONFIG_MK_LINES),( $(foreach line,$(MOZCONFIG_MK_LINES), echo '$(subst ||, ,$(line))';) )) > $@ # Include that makefile so that it is created. This should not actually change # the environment since MOZCONFIG_CONTENT, which MOZCONFIG_OUT_LINES derives # from, has already been eval'ed. --include $(OBJDIR)/.mozconfig.mk +include $(OBJDIR)/.mozconfig.mk endif # Print out any options loaded from mozconfig. all realbuild clean distclean export libs install realclean:: ifneq (,$(strip $(MOZCONFIG_OUT_FILTERED))) $(info Adding client.mk options from $(FOUND_MOZCONFIG):) $(foreach line,$(MOZCONFIG_OUT_FILTERED),$(info $(NULL) $(NULL) $(NULL) $(NULL) $(subst ||, ,$(line)))) endif