diff options
| author | Hans Wennborg <hans@chromium.org> | 2015-06-12 16:42:55 -0700 |
|---|---|---|
| committer | Hans Wennborg <hans@chromium.org> | 2015-06-12 23:46:14 +0000 |
| commit | b8cce88bf27fe0bb4614c401d7c5bdbf193c587f (patch) | |
| tree | 72c865369b8eb1e396e9df3750b25d2b21e1b716 | |
| parent | 58b00ba2adf7a03b7fe2ef7ee950ddba06bdde55 (diff) | |
| download | chromium_src-b8cce88bf27fe0bb4614c401d7c5bdbf193c587f.zip chromium_src-b8cce88bf27fe0bb4614c401d7c5bdbf193c587f.tar.gz chromium_src-b8cce88bf27fe0bb4614c401d7c5bdbf193c587f.tar.bz2 | |
Roll Win-Clang 238562:239639
This picks up several fixes related to dllexport on explicit
instantiation definitions, and name lookup in dependent base
classes.
BUG=82385, 492283
TBR=thakis
Review URL: https://codereview.chromium.org/1182953002.
Cr-Commit-Position: refs/heads/master@{#334283}
| -rwxr-xr-x | tools/clang/scripts/package.py | 4 | ||||
| -rwxr-xr-x | tools/clang/scripts/update.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/clang/scripts/package.py b/tools/clang/scripts/package.py index 19a8ab9..ff28ba5 100755 --- a/tools/clang/scripts/package.py +++ b/tools/clang/scripts/package.py @@ -76,9 +76,9 @@ def main(): TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'tools', 'clang')], log, fail_hard=False) Tee('Diff in llvm/compiler-rt:\n', log) - TeeCmd(['svn', 'stat', os.path.join(LLVM_DIR, 'compiler-rt')], + TeeCmd(['svn', 'stat', os.path.join(LLVM_DIR, 'projects', 'compiler-rt')], log, fail_hard=False) - TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'compiler-rt')], + TeeCmd(['svn', 'diff', os.path.join(LLVM_DIR, 'projects', 'compiler-rt')], log, fail_hard=False) Tee('Diff in llvm/projects/libcxx:\n', log) TeeCmd(['svn', 'stat', os.path.join(LLVM_DIR, 'projects', 'libcxx')], diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py index aa74bdc..da12b59 100755 --- a/tools/clang/scripts/update.py +++ b/tools/clang/scripts/update.py @@ -26,7 +26,7 @@ import zipfile # Note: this revision is only used for Windows. Other platforms use update.sh. # TODO(thakis): Use the same revision on Windows and non-Windows. # TODO(thakis): Remove update.sh, use update.py everywhere. -LLVM_WIN_REVISION = '238562' +LLVM_WIN_REVISION = '239639' use_head_revision = 'LLVM_FORCE_HEAD_REVISION' in os.environ if use_head_revision: |