From 203ccdd97647f89e7e65f2dcbeda7b19536ea985 Mon Sep 17 00:00:00 2001 From: kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> Date: Fri, 3 Dec 2021 16:47:05 -0600 Subject: LLVM: Revert build_llvm_dylib to llvm_dylib (#27761) --- var/spack/repos/builtin/packages/llvm/package.py | 8 ++++---- 1 file changed, 4 insertions(+), 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 d87c924d6b..062b5241ad 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -127,7 +127,7 @@ class Llvm(CMakePackage, CudaPackage): "less memory to build, less stable", ) variant( - "build_llvm_dylib", + "llvm_dylib", default=False, description="Build LLVM shared library, containing all " "components in a single shared library", @@ -202,8 +202,8 @@ class Llvm(CMakePackage, CudaPackage): depends_on("gmp", when="@:3.6 +polly") depends_on("isl", when="@:3.6 +polly") - conflicts("+build_llvm_dylib", when="+shared_libs") - conflicts("+link_llvm_dylib", when="~build_llvm_dylib") + conflicts("+llvm_dylib", when="+shared_libs") + conflicts("+link_llvm_dylib", when="~llvm_dylib") conflicts("+lldb", when="~clang") conflicts("+libcxx", when="~clang") conflicts("+internal_unwind", when="~clang") @@ -609,7 +609,7 @@ class Llvm(CMakePackage, CudaPackage): cmake_args.extend([ from_variant("BUILD_SHARED_LIBS", "shared_libs"), - from_variant("LLVM_BUILD_LLVM_DYLIB", "build_llvm_dylib"), + from_variant("LLVM_BUILD_LLVM_DYLIB", "llvm_dylib"), from_variant("LLVM_LINK_LLVM_DYLIB", "link_llvm_dylib"), from_variant("LLVM_USE_SPLIT_DWARF", "split_dwarf"), # By default on Linux, libc++.so is a ldscript. CMake fails to add -- cgit v1.2.3-70-g09d2