diff options
| author | Chuck Atkins <chuck.atkins@kitware.com> | 2019-04-29 10:39:13 -0400 |
|---|---|---|
| committer | Peter Scheibel <scheibel1@llnl.gov> | 2019-05-08 04:36:43 +0900 |
| commit | e4ce4e5c2c3ae83d24965ed95b3d6cf6aa94b9cf (patch) | |
| tree | 1186b73d9d2b5fb4f6e728a3e5de9019e947ddd2 | |
| parent | 4a83b4710c2d0f2ceebb3aebdc93c5f4659a662f (diff) | |
| download | spack-e4ce4e5c2c3ae83d24965ed95b3d6cf6aa94b9cf.tar.gz spack-e4ce4e5c2c3ae83d24965ed95b3d6cf6aa94b9cf.tar.bz2 spack-e4ce4e5c2c3ae83d24965ed95b3d6cf6aa94b9cf.tar.xz spack-e4ce4e5c2c3ae83d24965ed95b3d6cf6aa94b9cf.zip | |
llvm: Adjust default supported targets
The default install for llvm should just be the common typical case, i.e.
support for local host and cpu architectures. Enablingsupport for the wide
array of auxiliary architectures should be explicit rather than implicit.
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm/package.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 605da19dae..9984149a88 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -60,7 +60,7 @@ class Llvm(CMakePackage): variant('link_dylib', default=False, description="Build and link the libLLVM shared library rather " "than static") - variant('all_targets', default=True, + variant('all_targets', default=False, description="Build all supported targets, default targets " "<current arch>,NVPTX,AMDGPU,CppBackend") variant('build_type', default='Release', @@ -663,13 +663,12 @@ class Llvm(CMakePackage): if '+all_targets' not in spec: # all is default on cmake + targets = ['NVPTX', 'AMDGPU'] if spec.version < Version('3.9.0'): - targets = ['CppBackend', 'NVPTX', 'AMDGPU'] - else: # Starting in 3.9.0 CppBackend is no longer a target (see # LLVM_ALL_TARGETS in llvm's top-level CMakeLists.txt for # the complete list of targets) - targets = ['NVPTX', 'AMDGPU'] + targets.append('CppBackend') if 'x86' in spec.architecture.target.lower(): targets.append('X86') @@ -684,7 +683,7 @@ class Llvm(CMakePackage): targets.append('PowerPC') cmake_args.append( - '-DLLVM_TARGETS_TO_BUILD:Bool=' + ';'.join(targets)) + '-DLLVM_TARGETS_TO_BUILD:STRING=' + ';'.join(targets)) if spec.satisfies('@4.0.0:') and spec.satisfies('platform=linux'): cmake_args.append('-DCMAKE_BUILD_WITH_INSTALL_RPATH=1') |