From aa1ae5250a5623082f4c312cf8e541765617adc7 Mon Sep 17 00:00:00 2001 From: Mikael Simberg Date: Fri, 12 Aug 2022 18:33:53 +0200 Subject: [PATCH] Use llvm13-thread.patch for all compilers when building llvm (#31661) --- .../llvm/{llvm13-thread.patch => llvm13-14-thread.patch} | 0 var/spack/repos/builtin/packages/llvm/package.py | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename var/spack/repos/builtin/packages/llvm/{llvm13-thread.patch => llvm13-14-thread.patch} (100%) diff --git a/var/spack/repos/builtin/packages/llvm/llvm13-thread.patch b/var/spack/repos/builtin/packages/llvm/llvm13-14-thread.patch similarity index 100% rename from var/spack/repos/builtin/packages/llvm/llvm13-thread.patch rename to 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 7c147764e93..fefeabbb511 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")