zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LLVM depends on cmake, and does not depend on isl

Browse Source 
Add cmake requirement.

Remove gmp and isl requirements. Using an external isl leads to a build failure for me on a fairly standard Fedora Linux workstation. The Spack package file says that isl is required for polly, however, the polly documentation states that as of LLVM 3.7, polly includes isl, and has no external dependencies any more.
This commit is contained in:
Erik Schnetter 2016-01-14 17:52:28 -05:00
parent 1268b41570
commit 3e703cc281
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
var/spack/packages/llvm/package.py
View File

@ -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 @@ def install(self, spec, prefix):
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,