Index: tools/clang/scripts/update.py |
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py |
index 5ee7c309d3478ec858b006e278652750b59b9fcb..5e8f568e390538f95cf862f72dfafbe41b99d513 100755 |
--- a/tools/clang/scripts/update.py |
+++ b/tools/clang/scripts/update.py |
@@ -23,6 +23,7 @@ LLVM_WIN_REVISION = 'HEAD' |
if (re.search(r'\b(asan)=1', os.environ.get('GYP_DEFINES', '')) and |
not 'LLVM_FORCE_HEAD_REVISION' in os.environ): |
LLVM_WIN_REVISION = '217738' |
+LLVM_WIN_REVISION = '217738' |
dcheng
2014/11/11 23:36:10
I temporarily pinned the revision when I was build
|
# Path constants. (All of these should be absolute paths.) |
THIS_DIR = os.path.abspath(os.path.dirname(__file__)) |
@@ -71,6 +72,7 @@ def DeleteFiles(dir, pattern): |
def ClobberChromiumBuildFiles(): |
"""Clobber Chomium build files.""" |
+ return |
dcheng
2014/11/11 23:36:10
Rebuilds were getting really long =(
|
print 'Clobbering Chromium build files...' |
out_dir = os.path.join(CHROMIUM_DIR, 'out') |
if os.path.isdir(out_dir): |
@@ -169,7 +171,7 @@ def UpdateClang(): |
print 'Updating Clang to %s...' % (LLVM_WIN_REVISION) |
if LLVM_WIN_REVISION != 'HEAD' and ReadStampFile() == LLVM_WIN_REVISION: |
print 'Already up to date.' |
- return 0 |
+ # return 0 |
AddCMakeToPath() |
ClobberChromiumBuildFiles() |
@@ -187,9 +189,15 @@ def UpdateClang(): |
RunCommand(GetVSVersion().SetupScript('x64') + |
['&&', 'cmake', '-GNinja', '-DCMAKE_BUILD_TYPE=Release', |
+ '-DCHROMIUM_TOOLS_SRC=%s' % os.path.join(CHROMIUM_DIR, 'tools', 'clang'), |
+ '-DCHROMIUM_TOOLS=rewrite_scoped_refptr', |
'-DLLVM_ENABLE_ASSERTIONS=ON', SubversionCmakeArg(), LLVM_DIR]) |
RunCommand(GetVSVersion().SetupScript('x64') + ['&&', 'ninja', 'all']) |
+ WriteStampFile(LLVM_WIN_REVISION) |
dcheng
2014/11/11 23:36:10
The small CMakeLists.txt shim in third_party/llvm/
|
+ print 'Clang update was successful.' |
+ return 0 |
+ |
# Do an x86 build of compiler-rt to get the 32-bit ASan run-time. |
# TODO(hans): Remove once the regular build above produces this. |
if not os.path.exists(COMPILER_RT_BUILD_DIR): |