[llvm-commits] CVS: llvm/Makefile.rules

[Reid Spencer]

Changes in directory llvm:

Makefile.rules updated: 1.277 -> 1.278
---
Log message:

Two corrections:
* When reconfiguring, make sure the config.cache file is blown away so that
  its (old) values don't short-circuit doing the tests. When a reconfigure
  is done, it should be done from scratch, without the cache.
* For dist-check, don't pass --with-llvmgccdir any more because configure
  doesn't have this option any more.


---
Diffs of the changes:  (+7 -1)

Index: llvm/Makefile.rules
diff -u llvm/Makefile.rules:1.277 llvm/Makefile.rules:1.278
--- llvm/Makefile.rules:1.277	Tue Dec 21 23:57:21 2004
+++ llvm/Makefile.rules	Thu Dec 23 21:36:31 2004
@@ -110,6 +110,9 @@
 reconfigure:
 	$(Echo) Reconfiguring $(BUILD_OBJ_ROOT)
 	$(Verb) cd $(BUILD_OBJ_ROOT) && \
+	  if test -w $(BUILD_OBJ_ROOT)/config.cache ; then \
+	    $(RM) $(BUILD_OBJ_ROOT)/config.cache ; \
+	  fi ; \
 	  $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \
 	  $(ConfigStatusScript)
 
@@ -117,6 +120,9 @@
 $(ConfigStatusScript): $(ConfigureScript)
 	$(Echo) Reconfiguring with $<
 	$(Verb) cd $(BUILD_OBJ_ROOT) && \
+	  if test -w $(BUILD_OBJ_ROOT)/config.cache ; then \
+	    $(RM) $(BUILD_OBJ_ROOT)/config.cache ; \
+	  fi ; \
 	  $(ConfigStatusScript) --recheck $(ConfigureScriptFLAGS) && \
 	  $(ConfigStatusScript)
 
@@ -1267,7 +1273,7 @@
 	  gunzip -c $(DistTarGZip) | $(TAR) xf - && \
 	  cd build && \
 	  ../$(DistName)/configure --prefix="$(DistCheckDir)/install" \
-	    --srcdir=../$(DistName) --with-llvmgccdir="$(LLVMGCCDIR)" && \
+	    --srcdir=../$(DistName) && \
 	  $(MAKE) all && \
 	  $(MAKE) check && \
 	  $(MAKE) install && \