From 2b112dd02c226da15e1989305b78f479c5587f20 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 4 Apr 2023 10:06:41 +0200 Subject: llvm: add missing zstd dep (#36613) --- var/spack/repos/builtin/packages/llvm/package.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index ed6956d5c3..dc08f93898 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -194,6 +194,12 @@ class Llvm(CMakePackage, CudaPackage): variant( "z3", default=False, when="+clang @8:", description="Use Z3 for the clang static analyzer" ) + variant( + "zstd", + default=False, + when="@15:", + description="Enable zstd support for static analyzer / lld", + ) provides("libllvm@14", when="@14.0.0:14") provides("libllvm@13", when="@13.0.0:13") @@ -233,6 +239,9 @@ class Llvm(CMakePackage, CudaPackage): # llvm-config --system-libs libraries. depends_on("zlib") + # needs zstd cmake config file, which is not added when built with makefile. + depends_on("zstd build_system=cmake", when="+zstd") + # lldb dependencies with when("+lldb +python"): depends_on("swig") @@ -556,6 +565,7 @@ class Llvm(CMakePackage, CudaPackage): define("PYTHON_EXECUTABLE", python.command.path), define("LIBOMP_USE_HWLOC", True), define("LIBOMP_HWLOC_INSTALL_DIR", spec["hwloc"].prefix), + from_variant("LLVM_ENABLE_ZSTD", "zstd"), ] version_suffix = spec.variants["version_suffix"].value -- cgit v1.2.3-60-g2f50