Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Side by Side Diff: tools/clang/scripts/update.py

Issue 2091753003: clang update.py: Force on --build-id for now. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 598 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 if cc is not None: cc_args.append('-DCMAKE_C_COMPILER=' + cc) 609 if cc is not None: cc_args.append('-DCMAKE_C_COMPILER=' + cc)
610 if cxx is not None: cc_args.append('-DCMAKE_CXX_COMPILER=' + cxx) 610 if cxx is not None: cc_args.append('-DCMAKE_CXX_COMPILER=' + cxx)
611 cmake_args += base_cmake_args + [ 611 cmake_args += base_cmake_args + [
612 '-DLLVM_BINUTILS_INCDIR=' + binutils_incdir, 612 '-DLLVM_BINUTILS_INCDIR=' + binutils_incdir,
613 '-DCMAKE_C_FLAGS=' + ' '.join(cflags), 613 '-DCMAKE_C_FLAGS=' + ' '.join(cflags),
614 '-DCMAKE_CXX_FLAGS=' + ' '.join(cxxflags), 614 '-DCMAKE_CXX_FLAGS=' + ' '.join(cxxflags),
615 '-DCMAKE_EXE_LINKER_FLAGS=' + ' '.join(ldflags), 615 '-DCMAKE_EXE_LINKER_FLAGS=' + ' '.join(ldflags),
616 '-DCMAKE_SHARED_LINKER_FLAGS=' + ' '.join(ldflags), 616 '-DCMAKE_SHARED_LINKER_FLAGS=' + ' '.join(ldflags),
617 '-DCMAKE_MODULE_LINKER_FLAGS=' + ' '.join(ldflags), 617 '-DCMAKE_MODULE_LINKER_FLAGS=' + ' '.join(ldflags),
618 '-DCMAKE_INSTALL_PREFIX=' + LLVM_BUILD_DIR, 618 '-DCMAKE_INSTALL_PREFIX=' + LLVM_BUILD_DIR,
619 # TODO(thakis): Remove this once official builds pass -Wl,--build-id
620 # explicitly, https://crbug.com/622775
621 '-DENABLE_LINKER_BUILD_ID=ON',
619 '-DCHROMIUM_TOOLS_SRC=%s' % os.path.join(CHROMIUM_DIR, 'tools', 'clang'), 622 '-DCHROMIUM_TOOLS_SRC=%s' % os.path.join(CHROMIUM_DIR, 'tools', 'clang'),
620 '-DCHROMIUM_TOOLS=%s' % ';'.join(args.tools)] 623 '-DCHROMIUM_TOOLS=%s' % ';'.join(args.tools)]
621 624
622 EnsureDirExists(LLVM_BUILD_DIR) 625 EnsureDirExists(LLVM_BUILD_DIR)
623 os.chdir(LLVM_BUILD_DIR) 626 os.chdir(LLVM_BUILD_DIR)
624 RmCmakeCache('.') 627 RmCmakeCache('.')
625 RunCommand(['cmake'] + cmake_args + [LLVM_DIR], 628 RunCommand(['cmake'] + cmake_args + [LLVM_DIR],
626 msvc_arch='x64', env=deployment_env) 629 msvc_arch='x64', env=deployment_env)
627 630
628 if args.gcc_toolchain: 631 if args.gcc_toolchain:
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 args.force_local_build = True 880 args.force_local_build = True
878 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): 881 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''):
879 # Only build the Android ASan rt on ToT bots when targetting Android. 882 # Only build the Android ASan rt on ToT bots when targetting Android.
880 args.with_android = False 883 args.with_android = False
881 884
882 return UpdateClang(args) 885 return UpdateClang(args)
883 886
884 887
885 if __name__ == '__main__': 888 if __name__ == '__main__':
886 sys.exit(main()) 889 sys.exit(main())
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698