hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Minor LLVM libomptarget fixes (#15788)

Browse source 
* Add myself as a maintainer

* This was a regression that occured in previous PR. Flang has been excised from LLVM for now until f18 is merged upstream.

* Libraries only needed when a GPU backend is present.
This commit is contained in:
Nichols A. Romero 2020-04-01 12:28:36 -05:00 committed by GitHub
parent 67fbf257f0
commit 917c0a0efd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
var/spack/repos/builtin/packages/llvm/package.py
View file

@ -19,7 +19,7 @@ class Llvm(CMakePackage):
url = "https://github.com/llvm/llvm-project/archive/llvmorg-7.1.0.tar.gz" url = "https://github.com/llvm/llvm-project/archive/llvmorg-7.1.0.tar.gz"
list_url = "http://releases.llvm.org/download.html" list_url = "http://releases.llvm.org/download.html"
git = "https://github.com/llvm/llvm-project" git = "https://github.com/llvm/llvm-project"
maintainers = ['trws'] maintainers = ['trws', 'naromero77']
family = "compiler" # Used by lmod family = "compiler" # Used by lmod
@ -132,23 +132,16 @@ class Llvm(CMakePackage):
description="Build with OpenMP capable thread sanitizer", description="Build with OpenMP capable thread sanitizer",
) )
variant("python", default=False, description="Install python bindings") variant("python", default=False, description="Install python bindings")
variant(
"flang",
default=False,
description="Build flang branch version instead",
)
extends("python", when="+python") extends("python", when="+python")
# Build dependency # Build dependency
depends_on("cmake@3.4.3:", type="build") depends_on("cmake@3.4.3:", type="build")
depends_on("python@2.7:2.8", when="@:4.999 ~python", type="build") depends_on("python@2.7:2.8", when="@:4.999 ~python", type="build")
depends_on("python@2.7:2.8", when="@5: ~python +flang", type="build")
depends_on("python", when="@5: ~python", type="build") depends_on("python", when="@5: ~python", type="build")
# Universal dependency # Universal dependency
depends_on("python@2.7:2.8", when="@:4.999+python") depends_on("python@2.7:2.8", when="@:4.999+python")
depends_on("python@2.7:2.8", when="@5:+python+flang")
depends_on("python", when="@5:+python") depends_on("python", when="@5:+python")
depends_on("z3", when="@9:") depends_on("z3", when="@9:")
@ -158,8 +151,8 @@ class Llvm(CMakePackage):
# openmp dependencies # openmp dependencies
depends_on("perl-data-dumper", type=("build")) depends_on("perl-data-dumper", type=("build"))
depends_on("hwloc") depends_on("hwloc")
depends_on("libelf") # libomptarget depends_on("libelf", when="+cuda") # libomptarget
depends_on("libffi") # libomptarget depends_on("libffi", when="+cuda") # libomptarget
# ncurses dependency # ncurses dependency
depends_on("ncurses+termlib") depends_on("ncurses+termlib")