diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-17 19:24:17 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-01-17 19:24:17 -0800 |
| commit | d802165e039a3661831e84ecbdd31f1c4107d39d (patch) | |
| tree | 799d74f9b95199905d8d299d27853e2b6aa3889e | |
| parent | c1e57e49ae4519702a9f6d6ad83f0f2bebef1492 (diff) | |
| parent | 3e703cc2812ab9120baabeab3914ee9fd9aefc8c (diff) | |
| download | spack-d802165e039a3661831e84ecbdd31f1c4107d39d.tar.gz spack-d802165e039a3661831e84ecbdd31f1c4107d39d.tar.bz2 spack-d802165e039a3661831e84ecbdd31f1c4107d39d.tar.xz spack-d802165e039a3661831e84ecbdd31f1c4107d39d.zip | |
Merge pull request #355 from eschnett/eschnett/llvm
LLVM depends on cmake, and does not depend on isl
| -rw-r--r-- | var/spack/packages/llvm/package.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/var/spack/packages/llvm/package.py b/var/spack/packages/llvm/package.py index d4be2b9541..a2b2c6eccc 100644 --- a/var/spack/packages/llvm/package.py +++ b/var/spack/packages/llvm/package.py @@ -48,6 +48,9 @@ class Llvm(Package): variant('gold', default=True, description="Add support for LTO with the gold linker plugin") + # Build dependency + depends_on('cmake @2.8.12.2:') + # Universal dependency depends_on('python@2.7:') @@ -60,8 +63,8 @@ class Llvm(Package): depends_on('binutils+gold', when='+gold') # polly plugin - depends_on('gmp', when='+polly') - depends_on('isl', when='+polly') + depends_on('gmp', when='@:3.6.999 +polly') + depends_on('isl', when='@:3.6.999 +polly') base_url = 'http://llvm.org/releases/%%(version)s/%(pkg)s-%%(version)s.src.tar.xz' llvm_url = base_url % { 'pkg' : 'llvm'} @@ -172,7 +175,7 @@ class Llvm(Package): env['CXXFLAGS'] = self.compiler.cxx11_flag cmake_args = [ arg for arg in std_cmake_args if 'BUILD_TYPE' not in arg ] - build_type = 'RelWithDebInfo' if '+debug' in spec else 'Release' + build_type = 'RelWithDebInfo' if '+debug' in spec else 'Release' cmake_args.extend([ '..', '-DCMAKE_BUILD_TYPE=' + build_type, |