From e4ce4e5c2c3ae83d24965ed95b3d6cf6aa94b9cf Mon Sep 17 00:00:00 2001 From: Chuck Atkins Date: Mon, 29 Apr 2019 10:39:13 -0400 Subject: [PATCH] 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. --- var/spack/repos/builtin/packages/llvm/package.py | 9 ++++----- 1 file 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 605da19daea..9984149a88f 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 " ",NVPTX,AMDGPU,CppBackend") variant('build_type', default='Release', @@ -663,13 +663,12 @@ def cmake_args(self): 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 @@ def cmake_args(self): 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')