From 3bc656808c6453f1f76353f32885719cfaba4eb4 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 23 May 2022 14:21:11 +0200 Subject: llvm: make "omp_as_runtime" variant conditional (#30782) fixes #30700 To avoid clingo adding penalties for not using the default value for a variant, it's better to model the variant as conditional where possible. --- var/spack/repos/builtin/packages/llvm/package.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index 690987b61b..476cf20879 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -165,6 +165,7 @@ class Llvm(CMakePackage, CudaPackage): variant( "omp_as_runtime", default=True, + when='+clang @12:', description="Build OpenMP runtime via ENABLE_RUNTIME by just-built Clang", ) variant('code_signing', default=False, @@ -268,10 +269,6 @@ class Llvm(CMakePackage, CudaPackage): # OMP TSAN exists in > 5.x conflicts("+omp_tsan", when="@:5") - # OpenMP via ENABLE_RUNTIME restrictions - conflicts("+omp_as_runtime", when="~clang", msg="omp_as_runtime requires clang being built.") - conflicts("+omp_as_runtime", when="@:11.1", msg="omp_as_runtime works since LLVM 12.") - # cuda_arch value must be specified conflicts("cuda_arch=none", when="+cuda", msg="A value for cuda_arch must be specified.") -- cgit v1.2.3-60-g2f50