summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorManuela Kuhn <36827019+manuelakuhn@users.noreply.github.com>2021-06-28 11:18:53 +0200
committerGitHub <noreply@github.com>2021-06-28 11:18:53 +0200
commit77a98cabfa1796c0c159329d8c6bb104b0345bed (patch)
tree322cddb24dfdc0002cfe383cf1f93b61502b2f3b /var
parentb6aea0d6bf08f4376789ceedc0816e4d24ddc64a (diff)
downloadspack-77a98cabfa1796c0c159329d8c6bb104b0345bed.tar.gz
spack-77a98cabfa1796c0c159329d8c6bb104b0345bed.tar.bz2
spack-77a98cabfa1796c0c159329d8c6bb104b0345bed.tar.xz
spack-77a98cabfa1796c0c159329d8c6bb104b0345bed.zip
llvm: add patch for gcc11 (#24363)
llvm10 was not compiling with gcc due to missing header (see #24270)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index b1fa6084a7..7cc9dcf513 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -188,7 +188,7 @@ class Llvm(CMakePackage, CudaPackage):
conflicts("+flang", when="@:10.999")
# Older LLVM do not build with newer GCC
- conflicts("%gcc@11:", when="@:10")
+ conflicts("%gcc@11:", when="@:7")
conflicts("%gcc@8:", when="@:5")
conflicts("%gcc@:5.0.999", when="@8:")
@@ -221,6 +221,12 @@ class Llvm(CMakePackage, CudaPackage):
# Github issue #4986
patch("llvm_gcc7.patch", when="@4.0.0:4.0.1+lldb %gcc@7.0:")
+
+ # https://github.com/spack/spack/issues/24270
+ patch('https://src.fedoraproject.org/rpms/llvm10/raw/7ce7ebd066955ea95ba2b491c41fbc6e4ee0643a/f/llvm10-gcc11.patch',
+ sha256='958c64838c9d469be514eef195eca0f8c3ab069bc4b64a48fad59991c626bab8',
+ when='@8:10 %gcc@11:')
+
# Backport from llvm master + additional fix
# see https://bugs.llvm.org/show_bug.cgi?id=39696
# for a bug report about this problem in llvm master.