Bug 757518 - Don't get stuck in a loop on systems where /usr/bin/makedepend does not exist. r=ted
authorChris Coulson <chris.coulson@canonical.com>
Tue, 22 May 2012 20:21:46 -0400
changeset 94649 5814957f9225a36b9b47011ae870643cd43c5de8
parent 94648 640557f458beb9ef790beedb03a7c1e2a95229c9
child 94650 f93a650e8a8cc243f1fe2739d10f007b90df2c8d
push idunknown
push userunknown
push dateunknown
reviewersted
bugs757518
milestone15.0a1
Bug 757518 - Don't get stuck in a loop on systems where /usr/bin/makedepend does not exist. r=ted
config/Makefile.in
js/src/config/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -143,20 +143,22 @@ ifndef CROSS_COMPILE
 ifdef USE_ELF_DYNSTR_GC
 elf-dynstr-gc: elf-dynstr-gc.c $(GLOBAL_DEPS)
 	$(CC) $(COMPILE_CFLAGS) $(GLIB_CFLAGS) -o $@ $< $(LDFLAGS) $(GLIB_LIBS) 
 endif
 endif
 
 FORCE:
 
+ifndef COMPILER_DEPEND
 ifdef MKDEPEND_DIR
 clean clobber realclean clobber_all::
 	cd $(MKDEPEND_DIR); $(MAKE) $@
 endif
+endif
 
 PYUNITS := \
   unit-Expression.py \
   unit-Preprocessor.py \
   unit-nsinstall.py \
   unit-printprereleasesuffix.py \
   unit-JarMaker.py \
   unit-buildlist.py \
--- a/js/src/config/Makefile.in
+++ b/js/src/config/Makefile.in
@@ -64,12 +64,14 @@ export:: \
 
 GARBAGE_DIRS += system_wrappers_js
 endif
 
 GARBAGE += $(srcdir)/*.pyc *.pyc
 
 FORCE:
 
+ifndef COMPILER_DEPEND
 ifdef MKDEPEND_DIR
 clean clobber realclean clobber_all::
 	cd $(MKDEPEND_DIR); $(MAKE) $@
 endif
+endif