Bug 991976 - Only fail creating .mozconfig.mk once. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 04 Apr 2014 14:57:36 +0900
changeset 177077 cf2c03bddca6e2ae4d6dd9ee8630a817e193518e
parent 177076 3f31b2d41649a3530ee255cfb85a1db5252cb014
child 177078 386862bbda8d69db44a805b8f0ad328c652e2902
push id6008
push userryanvm@gmail.com
push dateFri, 04 Apr 2014 19:02:26 +0000
treeherderb2g-inbound@e9c9f9e64fda [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs991976
milestone31.0a1
Bug 991976 - Only fail creating .mozconfig.mk once. r=mshal
client.mk
--- 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