diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-10 21:36:34 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-10 21:36:34 +0000 |
| commit | 1ef501dd8484e9304d69153ad8c64a051f6f3a6c (patch) | |
| tree | abd54af7ddef19f5971246c38f9e4c3d999d1e87 /tools/clang | |
| parent | b6ce91bbe84f6009d6549c8041c33dc1fd94f4ad (diff) | |
| download | chromium_src-1ef501dd8484e9304d69153ad8c64a051f6f3a6c.zip chromium_src-1ef501dd8484e9304d69153ad8c64a051f6f3a6c.tar.gz chromium_src-1ef501dd8484e9304d69153ad8c64a051f6f3a6c.tar.bz2 | |
Try to fix the clang bots.
TBR=maruel
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/clang')
| -rw-r--r-- | tools/clang/plugins/Makefile | 6 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.sh | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/tools/clang/plugins/Makefile b/tools/clang/plugins/Makefile index 63cb9e6..0cfec71 100644 --- a/tools/clang/plugins/Makefile +++ b/tools/clang/plugins/Makefile @@ -2,9 +2,9 @@ # Makefile, you should execute the following commands to copy this directory # into a clang checkout: # -# cp -R <this directory> third_party/llvm-build/tools/clang/tools/chrome-plugin -# cd third_party/llvm-build/tools/clang/tools/chrome-plugin -# make +# cp -R <this directory> third_party/llvm/tools/clang/tools/chrome-plugin +# cd third_party/llvm/tools/clang/tools/chrome-plugin +# make CLANG_LEVEL := ../.. LIBRARYNAME = FindBadConstructs diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index b8508ca..7cc55ec 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -38,9 +38,12 @@ cd - # Copy it into the clang tree and use clang's build system to compile the # plugin. PLUGIN_SRC_DIR=$THIS_DIR/../plugins -PLUGIN_DST_DIR=$LLVM_DIR/../llvm-build/tools/clang/tools/chrome-plugin +PLUGIN_DST_DIR=$LLVM_DIR/../llvm/tools/clang/tools/chrome-plugin +PLUGIN_BUILD_DIR=$LLVM_DIR/../llvm-build/tools/clang/tools/chrome-plugin rm -rf $PLUGIN_DST_DIR cp -R $PLUGIN_SRC_DIR $PLUGIN_DST_DIR -cd $PLUGIN_DST_DIR +mkdir -p $PLUGIN_BUILD_DIR +cp $PLUGIN_SRC_DIR/Makefile $PLUGIN_BUILD_DIR +cd $PLUGIN_BUILD_DIR make -j3 cd - |