| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """This script is used to download prebuilt clang binaries. | 6 """This script is used to download prebuilt clang binaries. |
| 7 | 7 |
| 8 It is also used by package.py to build the prebuilt clang binaries.""" | 8 It is also used by package.py to build the prebuilt clang binaries.""" |
| 9 | 9 |
| 10 import argparse | 10 import argparse |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 292 f.write('# disallows reuse of the same binary dir for multiple source\n') | 292 f.write('# disallows reuse of the same binary dir for multiple source\n') |
| 293 f.write('# dirs, so the build artifacts need to go into a subdirectory.\n') | 293 f.write('# dirs, so the build artifacts need to go into a subdirectory.\n') |
| 294 f.write('# dirs, so the build artifacts need to go into a subdirectory.\n') | 294 f.write('# dirs, so the build artifacts need to go into a subdirectory.\n') |
| 295 f.write('if (CHROMIUM_TOOLS_SRC)\n') | 295 f.write('if (CHROMIUM_TOOLS_SRC)\n') |
| 296 f.write(' add_subdirectory(${CHROMIUM_TOOLS_SRC} ' + | 296 f.write(' add_subdirectory(${CHROMIUM_TOOLS_SRC} ' + |
| 297 '${CMAKE_CURRENT_BINARY_DIR}/a)\n') | 297 '${CMAKE_CURRENT_BINARY_DIR}/a)\n') |
| 298 f.write('endif (CHROMIUM_TOOLS_SRC)\n') | 298 f.write('endif (CHROMIUM_TOOLS_SRC)\n') |
| 299 | 299 |
| 300 | 300 |
| 301 def DownloadHostGcc(args): | 301 def DownloadHostGcc(args): |
| 302 """Downloads gcc 4.8.2 and makes sure args.gcc_toolchain is set.""" | 302 """Downloads gcc 4.8.5 and makes sure args.gcc_toolchain is set.""" |
| 303 if not sys.platform.startswith('linux') or args.gcc_toolchain: | 303 if not sys.platform.startswith('linux') or args.gcc_toolchain: |
| 304 return | 304 return |
| 305 # Unconditionally download a prebuilt gcc to guarantee the included libstdc++ | 305 # Unconditionally download a prebuilt gcc to guarantee the included libstdc++ |
| 306 # works on Ubuntu Precise. | 306 # works on Ubuntu Precise. |
| 307 gcc_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'gcc482precise') | 307 gcc_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, 'gcc485precise') |
| 308 if not os.path.exists(gcc_dir): | 308 if not os.path.exists(gcc_dir): |
| 309 print 'Downloading pre-built GCC 4.8.2...' | 309 print 'Downloading pre-built GCC 4.8.5...' |
| 310 DownloadAndUnpack( | 310 DownloadAndUnpack( |
| 311 CDS_URL + '/tools/gcc482precise.tgz', LLVM_BUILD_TOOLS_DIR) | 311 CDS_URL + '/tools/gcc485precise.tgz', LLVM_BUILD_TOOLS_DIR) |
| 312 args.gcc_toolchain = gcc_dir | 312 args.gcc_toolchain = gcc_dir |
| 313 | 313 |
| 314 | 314 |
| 315 def AddCMakeToPath(): | 315 def AddCMakeToPath(): |
| 316 """Download CMake and add it to PATH.""" | 316 """Download CMake and add it to PATH.""" |
| 317 if sys.platform == 'win32': | 317 if sys.platform == 'win32': |
| 318 zip_name = 'cmake-3.4.3-win32-x86.zip' | 318 zip_name = 'cmake-3.4.3-win32-x86.zip' |
| 319 cmake_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, | 319 cmake_dir = os.path.join(LLVM_BUILD_TOOLS_DIR, |
| 320 'cmake-3.4.3-win32-x86', 'bin') | 320 'cmake-3.4.3-win32-x86', 'bin') |
| 321 else: | 321 else: |
| (...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 900 args.force_local_build = True | 900 args.force_local_build = True |
| 901 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): | 901 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): |
| 902 # Only build the Android ASan rt on ToT bots when targetting Android. | 902 # Only build the Android ASan rt on ToT bots when targetting Android. |
| 903 args.with_android = False | 903 args.with_android = False |
| 904 | 904 |
| 905 return UpdateClang(args) | 905 return UpdateClang(args) |
| 906 | 906 |
| 907 | 907 |
| 908 if __name__ == '__main__': | 908 if __name__ == '__main__': |
| 909 sys.exit(main()) | 909 sys.exit(main()) |
| OLD | NEW |