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

Side by Side Diff: toolchain_build/toolchain_build_pnacl.py

Issue 1018123002: Install llvm utils when buidling with cmake (Closed) Base URL: https://chromium.googlesource.com/native_client/src/native_client.git@master
Patch Set: Using correct llvm hash. Created 5 years, 9 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 | « pnacl/COMPONENT_REVISIONS ('k') | 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/python 1 #!/usr/bin/python
2 # Copyright (c) 2013 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2013 The Native Client 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 """Recipes for PNaCl toolchain packages. 6 """Recipes for PNaCl toolchain packages.
7 7
8 Recipes consist of specially-structured dictionaries, with keys for package 8 Recipes consist of specially-structured dictionaries, with keys for package
9 name, type, commands to execute, etc. The structure is documented in the 9 name, type, commands to execute, etc. The structure is documented in the
10 PackageBuilder docstring in toolchain_main.py. 10 PackageBuilder docstring in toolchain_main.py.
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after
641 '-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib', 641 '-DCMAKE_INSTALL_RPATH=$ORIGIN/../lib',
642 '-DLLVM_APPEND_VC_REV=ON', 642 '-DLLVM_APPEND_VC_REV=ON',
643 '-DLLVM_BINUTILS_INCDIR=%(abs_binutils_pnacl_src)s/include', 643 '-DLLVM_BINUTILS_INCDIR=%(abs_binutils_pnacl_src)s/include',
644 '-DLLVM_BUILD_TESTS=ON', 644 '-DLLVM_BUILD_TESTS=ON',
645 '-DLLVM_ENABLE_ASSERTIONS=ON', 645 '-DLLVM_ENABLE_ASSERTIONS=ON',
646 '-DLLVM_ENABLE_LIBCXX=OFF', 646 '-DLLVM_ENABLE_LIBCXX=OFF',
647 '-LLVM_ENABLE_WERROR=' + ('ON' if llvm_do_werror else 'OFF'), 647 '-LLVM_ENABLE_WERROR=' + ('ON' if llvm_do_werror else 'OFF'),
648 '-DLLVM_ENABLE_ZLIB=OFF', 648 '-DLLVM_ENABLE_ZLIB=OFF',
649 '-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=%(clang_src)s', 649 '-DLLVM_EXTERNAL_CLANG_SOURCE_DIR=%(clang_src)s',
650 '-DLLVM_EXTERNAL_SUBZERO_SOURCE_DIR=%(subzero_src)s', 650 '-DLLVM_EXTERNAL_SUBZERO_SOURCE_DIR=%(subzero_src)s',
651 '-DLLVM_INSTALL_UTILS=ON',
651 '-DLLVM_TARGETS_TO_BUILD=X86;ARM;Mips', 652 '-DLLVM_TARGETS_TO_BUILD=X86;ARM;Mips',
652 '%(llvm_src)s']), 653 '%(llvm_src)s']),
653 command.Command(['ninja', '-v']), 654 command.Command(['ninja', '-v']),
654 command.Command(['ninja', 'install']), 655 command.Command(['ninja', 'install']),
655 ] + 656 ] +
656 CreateSymLinksToDirectToNaClTools(host) 657 CreateSymLinksToDirectToNaClTools(host)
657 }, 658 },
658 } 659 }
659 cleanup_static_libs = [] 660 cleanup_static_libs = []
660 shared = [] 661 shared = []
(...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after
1142 'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_runtime_canonical)) 1143 'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_runtime_canonical))
1143 1144
1144 if args.build_sbtc and not args.pnacl_in_pnacl: 1145 if args.build_sbtc and not args.pnacl_in_pnacl:
1145 packages.update(pnacl_sandboxed_translator.SandboxedTranslators( 1146 packages.update(pnacl_sandboxed_translator.SandboxedTranslators(
1146 SANDBOXED_TRANSLATOR_ARCHES)) 1147 SANDBOXED_TRANSLATOR_ARCHES))
1147 1148
1148 tb = toolchain_main.PackageBuilder(packages, 1149 tb = toolchain_main.PackageBuilder(packages,
1149 upload_packages, 1150 upload_packages,
1150 leftover_args) 1151 leftover_args)
1151 tb.Main() 1152 tb.Main()
OLDNEW
« no previous file with comments | « pnacl/COMPONENT_REVISIONS ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698