diff options
| author | Reid Spencer <rspencer@reidspencer.com> | 2004-12-24 03:36:31 +0000 |
|---|---|---|
| committer | Reid Spencer <rspencer@reidspencer.com> | 2004-12-24 03:36:31 +0000 |
| commit | 32924e01f3250b0ca9f577172625f83ad9bac472 (patch) | |
| tree | 025cfe76c614a06db1a56e25d91db7ac47a6e97f | |
| parent | 0a43d3954af32fa6ce172b6321664d9b2cd7cd22 (diff) | |
| download | llvm-32924e01f3250b0ca9f577172625f83ad9bac472.tar.gz llvm-32924e01f3250b0ca9f577172625f83ad9bac472.tar.bz2 llvm-32924e01f3250b0ca9f577172625f83ad9bac472.tar.xz | |
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
| -rw-r--r-- | Makefile.rules | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules index 94252f29a6..280f140096 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -110,6 +110,9 @@ $(BUILT_SOURCES) : $(ObjMakefiles) 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 @@ reconfigure: $(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 @@ dist-check:: $(DistTarGZip) 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 && \ |