Start landing build support for Clang-style ASan on Windows

tools/clang/scripts/update.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Windows can't run .sh files, so this is a Python implementation of
 update.sh. This script should replace update.sh on all platforms eventually."""
 
 import os
 import re
 import subprocess
 import sys
 
 # 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.
 # Note: this revision is only used for Windows. Other platforms use update.sh.
-LLVM_WINDOWS_REVISION = '201116'
+LLVM_WINDOWS_REVISION = '201117'
 
 # Path constants. (All of these should be absolute paths.)
 THIS_DIR = os.path.abspath(os.path.dirname(__file__))
 CHROMIUM_DIR = os.path.abspath(os.path.join(THIS_DIR, '..', '..', '..'))
 LLVM_DIR = os.path.join(CHROMIUM_DIR, 'third_party', 'llvm')
 LLVM_BUILD_DIR = os.path.join(CHROMIUM_DIR, 'third_party', 'llvm-build',
                               'Release+Asserts')
 CLANG_DIR = os.path.join(LLVM_DIR, 'tools', 'clang')
 COMPILER_RT_DIR = os.path.join(LLVM_DIR, 'projects', 'compiler-rt')
 STAMP_FILE = os.path.join(LLVM_BUILD_DIR, 'cr_build_revision')
@@ skipping 95 matching lines @@
   Checkout('compiler-rt', LLVM_REPO_URL + '/compiler-rt/trunk', COMPILER_RT_DIR)
 
   if not os.path.exists(LLVM_BUILD_DIR):
     os.makedirs(LLVM_BUILD_DIR)
   os.chdir(LLVM_BUILD_DIR)
 
   if not re.search(r'cmake', os.environ['PATH'], flags=re.IGNORECASE):
     # If CMake is not on the path, try looking in a standard location.
     os.environ['PATH'] += os.pathsep + 'C:\\Program Files (x86)\\CMake 2.8\\bin'
 
-  RunCommand(GetVSVersion().SetupScript('x64') +
+  # TODO(hans): Do an amd64 build once that supports building ASan runtime.
+  RunCommand(GetVSVersion().SetupScript('x86') +
              ['&&', 'cmake', '-GNinja', '-DCMAKE_BUILD_TYPE=Release',
               '-DLLVM_ENABLE_ASSERTIONS=ON', LLVM_DIR])
 
-  RunCommand(GetVSVersion().SetupScript('x64') + ['&&', 'ninja', 'all'])
+  RunCommand(GetVSVersion().SetupScript('x86') + ['&&', 'ninja', 'all'])
 
   WriteStampFile(LLVM_WINDOWS_REVISION)
   print 'Clang update was successful.'
   return 0
 
 
 def main():
   if not sys.platform in ['win32', 'cygwin']:
     # For non-Windows, fall back to update.sh.
     # TODO(hans): Make update.py replace update.sh completely.
@@ skipping 13 matching lines @@
 
   if not re.search('clang=1', os.environ.get('GYP_DEFINES', '')):
     print 'Skipping Clang update (clang=1 was not set in GYP_DEFINES).'
     return 0
 
   return UpdateClang()
 
 
 if __name__ == '__main__':
   sys.exit(main())