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

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

Issue 2784423003: clang: Stop implicitly passing -Wl,--build-id to the linker. (Closed)
Patch Set: Created 3 years, 8 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 629 matching lines...) Expand 10 before | Expand all | Expand 10 after
640 chrome_tools = list(set(['plugins', 'blink_gc_plugin'] + args.extra_tools)) 640 chrome_tools = list(set(['plugins', 'blink_gc_plugin'] + args.extra_tools))
641 cmake_args += base_cmake_args + [ 641 cmake_args += base_cmake_args + [
642 '-DLLVM_ENABLE_THREADS=OFF', 642 '-DLLVM_ENABLE_THREADS=OFF',
643 '-DLLVM_BINUTILS_INCDIR=' + binutils_incdir, 643 '-DLLVM_BINUTILS_INCDIR=' + binutils_incdir,
644 '-DCMAKE_C_FLAGS=' + ' '.join(cflags), 644 '-DCMAKE_C_FLAGS=' + ' '.join(cflags),
645 '-DCMAKE_CXX_FLAGS=' + ' '.join(cxxflags), 645 '-DCMAKE_CXX_FLAGS=' + ' '.join(cxxflags),
646 '-DCMAKE_EXE_LINKER_FLAGS=' + ' '.join(ldflags), 646 '-DCMAKE_EXE_LINKER_FLAGS=' + ' '.join(ldflags),
647 '-DCMAKE_SHARED_LINKER_FLAGS=' + ' '.join(ldflags), 647 '-DCMAKE_SHARED_LINKER_FLAGS=' + ' '.join(ldflags),
648 '-DCMAKE_MODULE_LINKER_FLAGS=' + ' '.join(ldflags), 648 '-DCMAKE_MODULE_LINKER_FLAGS=' + ' '.join(ldflags),
649 '-DCMAKE_INSTALL_PREFIX=' + LLVM_BUILD_DIR, 649 '-DCMAKE_INSTALL_PREFIX=' + LLVM_BUILD_DIR,
650 # TODO(thakis): Remove this once official builds pass -Wl,--build-id
651 # explicitly, https://crbug.com/622775
652 '-DENABLE_LINKER_BUILD_ID=ON',
653 '-DCHROMIUM_TOOLS_SRC=%s' % os.path.join(CHROMIUM_DIR, 'tools', 'clang'), 650 '-DCHROMIUM_TOOLS_SRC=%s' % os.path.join(CHROMIUM_DIR, 'tools', 'clang'),
654 '-DCHROMIUM_TOOLS=%s' % ';'.join(chrome_tools)] 651 '-DCHROMIUM_TOOLS=%s' % ';'.join(chrome_tools)]
655 652
656 EnsureDirExists(LLVM_BUILD_DIR) 653 EnsureDirExists(LLVM_BUILD_DIR)
657 os.chdir(LLVM_BUILD_DIR) 654 os.chdir(LLVM_BUILD_DIR)
658 RmCmakeCache('.') 655 RmCmakeCache('.')
659 RunCommand(['cmake'] + cmake_args + [LLVM_DIR], 656 RunCommand(['cmake'] + cmake_args + [LLVM_DIR],
660 msvc_arch='x64', env=deployment_env) 657 msvc_arch='x64', env=deployment_env)
661 658
662 if args.gcc_toolchain: 659 if args.gcc_toolchain:
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 args.force_local_build = True 908 args.force_local_build = True
912 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''): 909 if 'OS=android' not in os.environ.get('GYP_DEFINES', ''):
913 # Only build the Android ASan rt on ToT bots when targetting Android. 910 # Only build the Android ASan rt on ToT bots when targetting Android.
914 args.with_android = False 911 args.with_android = False
915 912
916 return UpdateClang(args) 913 return UpdateClang(args)
917 914
918 915
919 if __name__ == '__main__': 916 if __name__ == '__main__':
920 sys.exit(main()) 917 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