summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Lee <lee218@llnl.gov>2018-03-22 13:42:41 -0700
committerAdam J. Stewart <ajstewart426@gmail.com>2018-03-22 15:42:41 -0500
commitbe3f08d0dee19e41f595b7145b9021700d3f9972 (patch)
treee67ebdc50a86ae1d3b0645b22c3321418b9d7f4f
parent0d7652c50856296d1e1081098e848d06092854e3 (diff)
downloadspack-be3f08d0dee19e41f595b7145b9021700d3f9972.tar.gz
spack-be3f08d0dee19e41f595b7145b9021700d3f9972.tar.bz2
spack-be3f08d0dee19e41f595b7145b9021700d3f9972.tar.xz
spack-be3f08d0dee19e41f595b7145b9021700d3f9972.zip
llvm+python+lldb depends on py-six for versions 5 and up (#7056)
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 850554c406..26cdb088ed 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -89,6 +89,7 @@ class Llvm(CMakePackage):
depends_on('ncurses', when='+lldb')
depends_on('swig', when='+lldb')
depends_on('libedit', when='+lldb')
+ depends_on('py-six', when='@5.0.0: +lldb +python')
# gold support
depends_on('binutils+gold', when='+gold')
@@ -441,6 +442,8 @@ class Llvm(CMakePackage):
'-DLLVM_POLLY_BUILD:Bool=OFF',
'-DLLVM_POLLY_LINK_INTO_TOOLS:Bool=OFF'])
+ if '+python' in spec and '+lldb' in spec and spec.satisfies('@5.0.0:'):
+ cmake_args.append('-DLLDB_USE_SYSTEM_SIX:Bool=TRUE')
if '+clang' not in spec:
cmake_args.append('-DLLVM_EXTERNAL_CLANG_BUILD:Bool=OFF')
if '+lldb' not in spec: