Back out changeset 6fe5a446b775 (bug 903118)

mozilla-spidermonkey · Sep 5, 2013 · 20537a9 · 20537a9
1 parent 3f1ad24
commit 20537a9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 77 deletions.
diff --git a/client.mk b/client.mk
@@ -104,9 +104,18 @@ endif
 # Load mozconfig Options
 
 # See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
-# mozconfig.mk needs to be loaded multiple times by configure, so we don't check
-# for INCLUDED_MOZCONFIG_MK
-include $(TOPSRCDIR)/config/makefiles/mozconfig.mk
+
+MOZCONFIG_LOADER := build/autoconf/mozconfig2client-mk
+
+define CR
+
+
+endef
+
+# As $(shell) doesn't preserve newlines, use sed to replace them with an
+# unlikely sequence (||), which is then replaced back to newlines by make
+# before evaluation.
+$(eval $(subst ||,$(CR),$(shell _PYMAKE=$(.PYMAKE) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) 2> $(TOPSRCDIR)/.mozconfig.out | sed 's/$$/||/')))
 
 ifdef AUTOCLOBBER
 export AUTOCLOBBER=1

diff --git a/config/makefiles/mozconfig.mk b/config/makefiles/mozconfig.mk
diff --git a/config/rules.mk b/config/rules.mk
@@ -10,10 +10,6 @@ ifndef topsrcdir
 $(error topsrcdir was not set))
 endif
 
-ifndef INCLUDED_MOZCONFIG_MK
-include $(topsrcdir)/config/makefiles/mozconfig.mk
-endif
-
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of

diff --git a/js/src/config/makefiles/mozconfig.mk b/js/src/config/makefiles/mozconfig.mk
diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk
@@ -10,10 +10,6 @@ ifndef topsrcdir
 $(error topsrcdir was not set))
 endif
 
-ifndef INCLUDED_MOZCONFIG_MK
-include $(topsrcdir)/config/makefiles/mozconfig.mk
-endif
-
 # Integrate with mozbuild-generated make files. We first verify that no
 # variables provided by the automatically generated .mk files are
 # present. If they are, this is a violation of the separation of