forked from OSchip/llvm-project
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. llvm-svn: 19126
This commit is contained in:
parent
b608aebc6c
commit
35655d69b5
|
@ -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 && \
|
||||
|
|
Loading…
Reference in New Issue