diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-11-10 01:16:48 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-11-10 01:16:48 +0000 |
| commit | 83337302595a6b85523be8522c2b6105c8e159d1 (patch) | |
| tree | d58b00e93760561884cfbc9f454117811f0e1101 /utils | |
| parent | affc6cf9d2b2b74532ce82027ac4524d1e29a658 (diff) | |
| download | external_llvm-83337302595a6b85523be8522c2b6105c8e159d1.zip external_llvm-83337302595a6b85523be8522c2b6105c8e159d1.tar.gz external_llvm-83337302595a6b85523be8522c2b6105c8e159d1.tar.bz2 | |
build/Make & CMake: Pass the appropriate --native-target and --enable-targets
options to llvm-build, so the all-targets etc. components are defined properly.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@144255 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/llvm-build/llvmbuild/main.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py index fe852a0..51923eb 100644 --- a/utils/llvm-build/llvmbuild/main.py +++ b/utils/llvm-build/llvmbuild/main.py @@ -505,7 +505,7 @@ def add_magic_target_components(parser, project, opts): determined based on the target configuration options. This currently is responsible for populating the required_libraries list of - the "Native", "NativeCodeGen", and "Engine" components. + the "all-targets", "Native", "NativeCodeGen", and "Engine" components. """ # Determine the available targets. @@ -536,8 +536,14 @@ def add_magic_target_components(parser, project, opts): if opts.enable_targets is None: enable_targets = available_targets.values() else: + # We support both space separated and semi-colon separated lists. + if ' ' in opts.enable_targets: + enable_target_names = opts.enable_targets.split() + else: + enable_target_names = opts.enable_targets.split(';') + enable_targets = [] - for name in opts.enable_targets.split(): + for name in enable_target_names: target = available_targets.get(name) if target is None: parser.error("invalid target to enable: %r (not in project)" % ( @@ -641,8 +647,8 @@ def main(): action="store", default=None) group.add_option("", "--enable-targets", dest="enable_targets", metavar="NAMES", - help=("Enable the given space separated list of targets, " - "or all targets if not present"), + help=("Enable the given space or semi-colon separated " + "list of targets, or all targets if not present"), action="store", default=None) parser.add_option_group(group) |