Bug 780421 - Use $(PYTHON) to run config.status. r=glandium
authorSiddharth Agarwal <sid.bugzilla@gmail.com>
Sun, 05 Aug 2012 12:42:57 +0200
changeset 106962 043cc75b3a4c3adfaf3a187d4deedf19d7615bb2
parent 106961 cda0a576a7a80599e1ab9994ed6d3fc44b29e3f1
child 106963 f56aa65b70ae39703f67e8d04bb252ee3eb18e24
push id1490
push userakeybl@mozilla.com
push dateMon, 08 Oct 2012 18:29:50 +0000
treeherdermozilla-beta@f335e7dacdc1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs780421
milestone17.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
Bug 780421 - Use $(PYTHON) to run config.status. r=glandium
client.mk
config/rules.mk
gfx/cairo/cairo/src/Makefile.in
js/src/config/rules.mk
--- a/client.mk
+++ b/client.mk
@@ -315,17 +315,17 @@ ifneq (,$(MAKEFILE))
 $(OBJDIR)/config.status: $(CONFIG_STATUS_DEPS)
 else
 $(OBJDIR)/Makefile: $(CONFIG_STATUS_DEPS)
 endif
 	@$(MAKE) -f $(TOPSRCDIR)/client.mk configure
 
 ifneq (,$(CONFIG_STATUS))
 $(OBJDIR)/config/autoconf.mk: $(TOPSRCDIR)/config/autoconf.mk.in
-	$(OBJDIR)/config.status -n --file=$(OBJDIR)/config/autoconf.mk
+	$(PYTHON) $(OBJDIR)/config.status -n --file=$(OBJDIR)/config/autoconf.mk
 endif
 
 
 ####################################
 # Depend
 
 depend:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
 	$(MOZ_MAKE) export && $(MOZ_MAKE) depend
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1149,34 +1149,34 @@ endif
 GARBAGE_DIRS += $(_JAVA_DIR)
 
 ###############################################################################
 # Update Makefiles
 ###############################################################################
 
 ifndef NO_MAKEFILE_RULE
 Makefile: Makefile.in
-	@$(DEPTH)/config.status -n --file=Makefile
+	@$(PYTHON) $(DEPTH)/config.status -n --file=Makefile
 endif
 
 ifndef NO_SUBMAKEFILES_RULE
 ifdef SUBMAKEFILES
 # VPATH does not work on some machines in this case, so add $(srcdir)
 $(SUBMAKEFILES): % : $(srcdir)/%.in
-	$(DEPTH)$(addprefix /,$(subsrcdir))/config.status -n --file=$@
+	$(PYTHON) $(DEPTH)$(addprefix /,$(subsrcdir))/config.status -n --file=$@
 endif
 endif
 
 ifdef AUTOUPDATE_CONFIGURE
 $(topsrcdir)/configure: $(topsrcdir)/configure.in
-	(cd $(topsrcdir) && $(AUTOCONF)) && $(DEPTH)/config.status -n --recheck)
+	(cd $(topsrcdir) && $(AUTOCONF)) && $(PYTHON) $(DEPTH)/config.status -n --recheck)
 endif
 
 $(DEPTH)/config/autoconf.mk: $(topsrcdir)/config/autoconf.mk.in
-	$(DEPTH)/config.status -n --file=$(DEPTH)/config/autoconf.mk
+	$(PYTHON) $(DEPTH)/config.status -n --file=$(DEPTH)/config/autoconf.mk
 	$(TOUCH) $@
 
 ###############################################################################
 # Bunch of things that extend the 'export' rule (in order):
 ###############################################################################
 
 ################################################################################
 # Copy each element of EXPORTS to $(DIST)/include
--- a/gfx/cairo/cairo/src/Makefile.in
+++ b/gfx/cairo/cairo/src/Makefile.in
@@ -228,9 +228,9 @@ endif
 ifndef MOZ_TREE_PIXMAN
 CFLAGS += $(MOZ_PIXMAN_CFLAGS)
 CXXFLAGS += $(MOZ_PIXMAN_CFLAGS)
 else
 DEFINES += -DMOZ_TREE_PIXMAN
 endif
 
 cairo-features.h: $(srcdir)/cairo-features.h.in $(GLOBAL_DEPS)
-	$(DEPTH)/config.status -n --file=$@
+	$(PYTHON) $(DEPTH)/config.status -n --file=$@
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@@ -1149,34 +1149,34 @@ endif
 GARBAGE_DIRS += $(_JAVA_DIR)
 
 ###############################################################################
 # Update Makefiles
 ###############################################################################
 
 ifndef NO_MAKEFILE_RULE
 Makefile: Makefile.in
-	@$(DEPTH)/config.status -n --file=Makefile
+	@$(PYTHON) $(DEPTH)/config.status -n --file=Makefile
 endif
 
 ifndef NO_SUBMAKEFILES_RULE
 ifdef SUBMAKEFILES
 # VPATH does not work on some machines in this case, so add $(srcdir)
 $(SUBMAKEFILES): % : $(srcdir)/%.in
-	$(DEPTH)$(addprefix /,$(subsrcdir))/config.status -n --file=$@
+	$(PYTHON) $(DEPTH)$(addprefix /,$(subsrcdir))/config.status -n --file=$@
 endif
 endif
 
 ifdef AUTOUPDATE_CONFIGURE
 $(topsrcdir)/configure: $(topsrcdir)/configure.in
-	(cd $(topsrcdir) && $(AUTOCONF)) && $(DEPTH)/config.status -n --recheck)
+	(cd $(topsrcdir) && $(AUTOCONF)) && $(PYTHON) $(DEPTH)/config.status -n --recheck)
 endif
 
 $(DEPTH)/config/autoconf.mk: $(topsrcdir)/config/autoconf.mk.in
-	$(DEPTH)/config.status -n --file=$(DEPTH)/config/autoconf.mk
+	$(PYTHON) $(DEPTH)/config.status -n --file=$(DEPTH)/config/autoconf.mk
 	$(TOUCH) $@
 
 ###############################################################################
 # Bunch of things that extend the 'export' rule (in order):
 ###############################################################################
 
 ################################################################################
 # Copy each element of EXPORTS to $(DIST)/include