summaryrefslogtreecommitdiffstats
path: root/tools/clang
diff options
context:
space:
mode:
Diffstat (limited to 'tools/clang')
-rw-r--r--tools/clang/plugins/Makefile6
-rwxr-xr-xtools/clang/scripts/update.sh7
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 -