summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Simberg <mikael.simberg@iki.fi>2022-08-12 18:33:53 +0200
committerGitHub <noreply@github.com>2022-08-12 10:33:53 -0600
commitaa1ae5250a5623082f4c312cf8e541765617adc7 (patch)
tree1e1135bb35f46d8f10498f12fc3e6b455d756f64
parent54ac5bdb4223d74ddd8d80652e2859bc5682b2c8 (diff)
downloadspack-aa1ae5250a5623082f4c312cf8e541765617adc7.tar.gz
spack-aa1ae5250a5623082f4c312cf8e541765617adc7.tar.bz2
spack-aa1ae5250a5623082f4c312cf8e541765617adc7.tar.xz
spack-aa1ae5250a5623082f4c312cf8e541765617adc7.zip
Use llvm13-thread.patch for all compilers when building llvm (#31661)
-rw-r--r--var/spack/repos/builtin/packages/llvm/llvm13-14-thread.patch (renamed from var/spack/repos/builtin/packages/llvm/llvm13-thread.patch)0
-rw-r--r--var/spack/repos/builtin/packages/llvm/package.py4
2 files changed, 3 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/llvm/llvm13-thread.patch b/var/spack/repos/builtin/packages/llvm/llvm13-14-thread.patch
index 0067a93037..0067a93037 100644
--- a/var/spack/repos/builtin/packages/llvm/llvm13-thread.patch
+++ b/var/spack/repos/builtin/packages/llvm/llvm13-14-thread.patch
diff --git a/var/spack/repos/builtin/packages/llvm/package.py b/var/spack/repos/builtin/packages/llvm/package.py
index 7c147764e9..fefeabbb51 100644
--- a/var/spack/repos/builtin/packages/llvm/package.py
+++ b/var/spack/repos/builtin/packages/llvm/package.py
@@ -356,7 +356,9 @@ class Llvm(CMakePackage, CudaPackage):
# add -lpthread to build OpenMP libraries with Fujitsu compiler
patch("llvm12-thread.patch", when="@12 %fj")
- patch("llvm13-thread.patch", when="@13 %fj")
+
+ # add -lpthread to build OpenMP libraries
+ patch("llvm13-14-thread.patch", when="@13:14")
# avoid build failed with Fujitsu compiler
patch("llvm13-fujitsu.patch", when="@13 %fj")