From 75042c381c9fd1412f0fce99aab9ebd43fd528c8 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Sat, 25 Apr 2020 21:36:08 -0700 Subject: LLVM lldb 10.0: Python Link Dependency (#16299) * LLVM: Python Dependency Effort to expose the linked python library when building LLVM. This might fix the forward propagation of libintl that comes with the static python library build on darwin. * LLDB Py: Remove Ignored Old Flags Changed in LLVM 10.0+ --- var/spack/repos/builtin/packages/llvm/package.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py index bf8a77933c..53ce3e12c2 100644 --- a/var/spack/repos/builtin/packages/llvm/package.py +++ b/var/spack/repos/builtin/packages/llvm/package.py @@ -287,8 +287,12 @@ class Llvm(CMakePackage, CudaPackage): if "+python" in spec and "+lldb" in spec and spec.satisfies("@5.0.0:"): cmake_args.append("-DLLDB_USE_SYSTEM_SIX:Bool=TRUE") - if "~python" in spec and "+lldb" in spec: - cmake_args.append("-DLLDB_DISABLE_PYTHON:Bool=TRUE") + if "+lldb" in spec and spec.satisfies("@:9.9.9"): + cmake_args.append("-DLLDB_DISABLE_PYTHON:Bool={0}".format( + 'ON' if '~python' in spec else 'OFF')) + if "+lldb" in spec and spec.satisfies("@10.0.0:"): + cmake_args.append("-DLLDB_ENABLE_PYTHON:Bool={0}".format( + 'ON' if '+python' in spec else 'OFF')) if "+gold" in spec: cmake_args.append( -- cgit v1.2.3-60-g2f50