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

Unified Diff: tools/clang/scripts/update.py

Issue 2609683002: clang update script: change --tools to --extra-tools (Closed)
Patch Set: . Created 3 years, 12 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 side-by-side diff with in-line comments
Download patch
« docs/clang_tool_refactoring.md ('K') | « docs/clang_tool_refactoring.md ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/clang/scripts/update.py
diff --git a/tools/clang/scripts/update.py b/tools/clang/scripts/update.py
index 31c3aef3d357dcde20141cae3a492c502b0b8510..6e12272e03b77d10f4963a09257eada1b2290a8d 100755
--- a/tools/clang/scripts/update.py
+++ b/tools/clang/scripts/update.py
@@ -633,6 +633,7 @@ def UpdateClang(args):
cc_args = base_cmake_args if sys.platform != 'win32' else cmake_args
if cc is not None: cc_args.append('-DCMAKE_C_COMPILER=' + cc)
if cxx is not None: cc_args.append('-DCMAKE_CXX_COMPILER=' + cxx)
+ chrome_tools = ['plugins', 'blink_gc_plugin'] + args.extra_tools
cmake_args += base_cmake_args + [
'-DLLVM_BINUTILS_INCDIR=' + binutils_incdir,
'-DCMAKE_C_FLAGS=' + ' '.join(cflags),
@@ -645,7 +646,7 @@ def UpdateClang(args):
# explicitly, https://crbug.com/622775
'-DENABLE_LINKER_BUILD_ID=ON',
'-DCHROMIUM_TOOLS_SRC=%s' % os.path.join(CHROMIUM_DIR, 'tools', 'clang'),
- '-DCHROMIUM_TOOLS=%s' % ';'.join(args.tools)]
+ '-DCHROMIUM_TOOLS=%s' % ';'.join(chrome_tools)]
EnsureDirExists(LLVM_BUILD_DIR)
os.chdir(LLVM_BUILD_DIR)
@@ -663,7 +664,7 @@ def UpdateClang(args):
RunCommand(['ninja'], msvc_arch='x64')
- if args.tools:
+ if chrome_tools:
# If any Chromium tools were built, install those now.
RunCommand(['ninja', 'cr-install'], msvc_arch='x64')
@@ -846,9 +847,8 @@ def main():
help='print current clang version (e.g. x.y.z) and exit.')
parser.add_argument('--run-tests', action='store_true',
help='run tests after building; only for local builds')
- parser.add_argument('--tools', nargs='*',
- help='select which chrome tools to build',
- default=['plugins', 'blink_gc_plugin'])
+ parser.add_argument('--extra-tools', nargs='*',
+ help='select additional chrome tools to build')
parser.add_argument('--without-android', action='store_false',
help='don\'t build Android ASan runtime (linux only)',
dest='with_android',
« docs/clang_tool_refactoring.md ('K') | « docs/clang_tool_refactoring.md ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698