Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Unified Diff: tools/clang/scripts/repackage.sh

Issue 453513004: Roll Clang 214024:216630 (+216684) and switch to CMake (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase, fix blink-gc plugin flags, disable -Wundefined-bool-conversion while testing Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/clang/scripts/repackage.sh
diff --git a/tools/clang/scripts/repackage.sh b/tools/clang/scripts/repackage.sh
index 3f7f1602e8f8e6c16717d61ecdd4583caf67376a..f4186f6fffe784f5a6f0df5bc4a765565912ff43 100755
--- a/tools/clang/scripts/repackage.sh
+++ b/tools/clang/scripts/repackage.sh
@@ -30,7 +30,7 @@ fi
"$THIS_DIR"/package.sh $@
R=$("${LLVM_BIN_DIR}/clang" --version | \
- sed -ne 's/clang version .*(trunk \([0-9]*\))/\1/p')
+ sed -ne 's/clang version .*(\([0-9]*\))/\1/p')
PDIR=clang-$R
if [ ! -f "$PDIR.tgz" ]; then
@@ -43,8 +43,9 @@ fi
rm -rf $LLVM_BUILD_DIR
"$THIS_DIR"/update.sh
-LIBNAME=$(grep LIBRARYNAME "$THIS_DIR"/../blink_gc_plugin/Makefile \
- | cut -d ' ' -f 3)
+LIBNAME=\
+$(grep 'set( LIBRARYNAME' "$THIS_DIR"/../blink_gc_plugin/CMakeLists.txt \
+ | cut -d ' ' -f 3)
LIBFILE=lib$LIBNAME.$SO_EXT

Powered by Google App Engine
This is Rietveld 408576698