diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 01:06:15 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-11 01:06:15 +0000 |
| commit | a3f7082232f133c669753ba60734af5700ee4c16 (patch) | |
| tree | 1246a0a814e3c2d812efcf6554d22021dd2f417d /tools | |
| parent | 7ac332e633a1db8e6ebf033ad814b3d17d5ed64c (diff) | |
| download | chromium_src-a3f7082232f133c669753ba60734af5700ee4c16.zip chromium_src-a3f7082232f133c669753ba60734af5700ee4c16.tar.gz chromium_src-a3f7082232f133c669753ba60734af5700ee4c16.tar.bz2 | |
clang: Only explicitly call configure if it's never been called.
If it has been called, the clang build will re-run it if necessary. And running
configure when nothing has changed causes several things to be rebuilt.
On my local machine, this brings the time this script takes if nothing changed
from 2:50m to 12s.
Idea by evan.
BUG=72609
TEST=none
Review URL: http://codereview.chromium.org/6485011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/clang/scripts/update.sh | 10 |
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 |