summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/clang/scripts/update.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh
index 7cc55ec..06e6458 100755
--- a/tools/clang/scripts/update.sh
+++ b/tools/clang/scripts/update.sh
@@ -5,7 +5,7 @@
# This script will check out llvm and clang into third_party/llvm and build it.
-CLANG_REVISION=125186
+CLANG_REVISION=125293
THIS_DIR=$(dirname $0)
LLVM_DIR=$THIS_DIR/../../../third_party/llvm
@@ -24,11 +24,13 @@ svn co --force http://llvm.org/svn/llvm-project/llvm/trunk@$CLANG_REVISION $LLVM
svn co --force http://llvm.org/svn/llvm-project/cfe/trunk@$CLANG_REVISION $CLANG_DIR
# Build (in a separate directory).
-# The clang bots have /usr/local/clang be a symbolic link into this hardcoded
-# directory, so if you change it you also need to change these links.
+# The clang bots have this path hardcoded in built/scripts/slave/compile.py,
+# so if you change it you also need to change these links.
mkdir -p $LLVM_DIR/../llvm-build
cd $LLVM_DIR/../llvm-build
-../llvm/configure --enable-optimized
+if [ ! -f ./config.status ]; then
+ ../llvm/configure --enable-optimized
+fi
# TODO(thakis): Make this the number of cores (use |sysctl hw.ncpu| on OS X and
# some grepping of /proc/cpuinfo on linux).
make -j3