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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19126 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Makefile.rules b/Makefile.rules
index 94252f2..280f140 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -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 && \