summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAuriane R <48684432+aurianer@users.noreply.github.com>2024-01-17 15:31:37 +0100
committerGitHub <noreply@github.com>2024-01-17 15:31:37 +0100
commit0331b0d044d739911eaf8b4ba45c1db1bbf495a3 (patch)
tree3091814a9f4da6cef791ab41ee839375c520a432
parent1ce81fc299a32f3aade26c37113c46c43a645bd2 (diff)
downloadspack-0331b0d044d739911eaf8b4ba45c1db1bbf495a3.tar.gz
spack-0331b0d044d739911eaf8b4ba45c1db1bbf495a3.tar.bz2
spack-0331b0d044d739911eaf8b4ba45c1db1bbf495a3.tar.xz
spack-0331b0d044d739911eaf8b4ba45c1db1bbf495a3.zip
Relax conflict in pika with cxxstd >= 20 and cuda <= 11 (#42118)
* Relax conflict with cxxstd >= 20 and cuda <= 11 * Update comment to be more specific to nvcc
-rw-r--r--var/spack/repos/builtin/packages/pika/package.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/pika/package.py b/var/spack/repos/builtin/packages/pika/package.py
index ae1d771176..be765efc9c 100644
--- a/var/spack/repos/builtin/packages/pika/package.py
+++ b/var/spack/repos/builtin/packages/pika/package.py
@@ -94,9 +94,9 @@ class Pika(CMakePackage, CudaPackage, ROCmPackage):
conflicts("%clang@:8", when="@0.2:")
conflicts("+stdexec", when="cxxstd=17")
conflicts("cxxstd=23", when="^cmake@:3.20.2")
- # CUDA version <= 11 does not support C++20 and newer
+ # nvcc version <= 11 does not support C++20 and newer
for cxxstd in filter(lambda x: x != "17", cxxstds):
- conflicts(f"cxxstd={cxxstd}", when="^cuda@:11")
+ requires("%nvhpc", when=f"cxxstd={cxxstd} ^cuda@:11")
# Other dependencies
depends_on("boost@1.71:")