Bug 677577 - Force an early failure when check-sync-dirs.py fails. r=ted
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 16 Aug 2011 09:35:17 +0200
changeset 76497 c5f8cb2c8ea463c620df1e7f1a44b257c0c58e66
parent 76064 a132017200d9622e55999b5ad9461717cc0945f3
child 76498 dfe63797f67a619bff1beb45c20982e300b9964a
push idunknown
push userunknown
push dateunknown
reviewersted
bugs677577
milestone8.0a1
Bug 677577 - Force an early failure when check-sync-dirs.py fails. r=ted
client.mk
--- a/client.mk
+++ b/client.mk
@@ -273,16 +273,17 @@ CONFIG_CACHE  = $(wildcard $(OBJDIR)/con
 
 EXTRA_CONFIG_DEPS := \
 	$(TOPSRCDIR)/aclocal.m4 \
 	$(wildcard $(TOPSRCDIR)/build/autoconf/*.m4) \
 	$(TOPSRCDIR)/js/src/aclocal.m4 \
 	$(NULL)
 
 $(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS)
+	@$(PYTHON) $(TOPSRCDIR)/js/src/config/check-sync-dirs.py $(TOPSRCDIR)/js/src/build $(TOPSRCDIR)/build
 	@echo Generating $@ using autoconf
 	cd $(@D); $(AUTOCONF)
 
 CONFIG_STATUS_DEPS := \
 	$(wildcard $(CONFIGURES)) \
 	$(TOPSRCDIR)/allmakefiles.sh \
 	$(TOPSRCDIR)/.mozconfig.mk \
 	$(wildcard $(TOPSRCDIR)/nsprpub/configure) \
@@ -341,16 +342,17 @@ ifdef MOZ_PREFLIGHT
 	  $(MAKE) -f $(TOPSRCDIR)/$$mkfile preflight TOPSRCDIR=$(TOPSRCDIR) OBJDIR=$(OBJDIR) MOZ_OBJDIR=$(MOZ_OBJDIR); \
 	done
 endif
 
 ####################################
 # Build it
 
 realbuild::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
+	@$(PYTHON) $(TOPSRCDIR)/js/src/config/check-sync-dirs.py $(TOPSRCDIR)/js/src/config $(TOPSRCDIR)/config
 	$(MOZ_MAKE)
 
 ####################################
 # Other targets
 
 # Pass these target onto the real build system
 install export libs clean realclean distclean alldep maybe_clobber_profiledbuild upload sdk:: $(OBJDIR)/Makefile $(OBJDIR)/config.status
 	$(MOZ_MAKE) $@