diff options
| author | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 15:55:17 +0000 |
|---|---|---|
| committer | hans@chromium.org <hans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-23 15:55:17 +0000 |
| commit | afecfbcc08b38394f1fbd70ac0f6505ed744dec8 (patch) | |
| tree | 3f553243f91cb397088dde569ef00c83585342fa | |
| parent | d7ae3c651b07c5cd81f4a4b8b5f3239a4c45c7a1 (diff) | |
| download | chromium_src-afecfbcc08b38394f1fbd70ac0f6505ed744dec8.zip chromium_src-afecfbcc08b38394f1fbd70ac0f6505ed744dec8.tar.gz chromium_src-afecfbcc08b38394f1fbd70ac0f6505ed744dec8.tar.bz2 | |
Roll Clang 206824:209387
BUG=370448
NOTRY=true
Review URL: https://codereview.chromium.org/296983008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272541 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | tools/clang/blink_gc_plugin/Makefile | 2 | ||||
| -rwxr-xr-x | tools/clang/scripts/package.sh | 6 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.sh | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/tools/clang/blink_gc_plugin/Makefile b/tools/clang/blink_gc_plugin/Makefile index 92a71ea..0b27448 100644 --- a/tools/clang/blink_gc_plugin/Makefile +++ b/tools/clang/blink_gc_plugin/Makefile @@ -9,7 +9,7 @@ CLANG_LEVEL := ../.. # This line is read by update.sh and other scripts in tools/clang/scripts -LIBRARYNAME = BlinkGCPlugin_7 +LIBRARYNAME = BlinkGCPlugin_8 LINK_LIBS_IN_SHARED = 0 SHARED_LIBRARY = 1 diff --git a/tools/clang/scripts/package.sh b/tools/clang/scripts/package.sh index 0c76601..993f694 100755 --- a/tools/clang/scripts/package.sh +++ b/tools/clang/scripts/package.sh @@ -106,8 +106,10 @@ if [ "$(uname -s)" = "Darwin" ]; then fi # Copy libc++ headers. -mkdir $PDIR/include -cp -R "${LLVM_BOOTSTRAP_INSTALL_DIR}/include/c++" $PDIR/include +if [ "$(uname -s)" = "Darwin" ]; then + mkdir $PDIR/include + cp -R "${LLVM_BOOTSTRAP_INSTALL_DIR}/include/c++" $PDIR/include +fi # Copy plugins. Some of the dylibs are pretty big, so copy only the ones we # care about. diff --git a/tools/clang/scripts/update.sh b/tools/clang/scripts/update.sh index 634f350..2beb4e3 100755 --- a/tools/clang/scripts/update.sh +++ b/tools/clang/scripts/update.sh @@ -8,7 +8,7 @@ # Do NOT CHANGE this if you don't know what you're doing -- see # https://code.google.com/p/chromium/wiki/UpdatingClang # Reverting problematic clang rolls is safe, though. -CLANG_REVISION=206824 +CLANG_REVISION=209387 THIS_DIR="$(dirname "${0}")" LLVM_DIR="${THIS_DIR}/../../../third_party/llvm" |