]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #9019 : alexcrichton/rust/reconfigure-llvm, r=brson
authorbors <bors@rust-lang.org>
Fri, 6 Sep 2013 23:51:00 +0000 (16:51 -0700)
committerbors <bors@rust-lang.org>
Fri, 6 Sep 2013 23:51:00 +0000 (16:51 -0700)
@Chris-Morgan ran into this, turns out if we have a clean llvm in the old location we won't rebuild/reconfigure even though we should.

configure

index fff961b734c04dbcdd10d8ac0fa3087fde1f8f03..d7c4523d543ef7035fd269008e77bac8d0d50b26 100755 (executable)
--- a/configure
+++ b/configure
@@ -823,7 +823,7 @@ do
         index2="${CFG_SRC_DIR}src/llvm/.git/index"
         for index in ${index1} ${index2}
         do
-            config_status="${CFG_BUILD_DIR}llvm/$t/config.status"
+            config_status="${LLVM_BUILD_DIR}/config.status"
             if test -e ${index} -a \
                     -e ${config_status} -a \
                     ${config_status} -nt ${index}