summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBram Veenboer <bram.veenboer@gmail.com>2022-01-21 12:08:20 +0100
committerGitHub <noreply@github.com>2022-01-21 11:08:20 +0000
commitbd43467cbfb2c5f2961019b42609811a8b06bb56 (patch)
treee7afdd1c1a84264efc15da2c5efadb797b389243 /lib
parent9b803a00b36d1d36a91716a6da7183b7aa479adc (diff)
downloadspack-bd43467cbfb2c5f2961019b42609811a8b06bb56.tar.gz
spack-bd43467cbfb2c5f2961019b42609811a8b06bb56.tar.bz2
spack-bd43467cbfb2c5f2961019b42609811a8b06bb56.tar.xz
spack-bd43467cbfb2c5f2961019b42609811a8b06bb56.zip
CUDA: add v11.6.0 (#28439)
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/build_systems/cuda.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py
index ce622a363c..8200737d76 100644
--- a/lib/spack/spack/build_systems/cuda.py
+++ b/lib/spack/spack/build_systems/cuda.py
@@ -105,10 +105,9 @@ class CudaPackage(PackageBase):
# This implies that the last one in the list has to be updated at
# each release of a new cuda minor version.
conflicts('%gcc@10:', when='+cuda ^cuda@:11.0')
- conflicts('%gcc@11:', when='+cuda ^cuda@:11.4.0')
- conflicts('%gcc@12:', when='+cuda ^cuda@:11.5.0')
- conflicts('%clang@12:', when='+cuda ^cuda@:11.4.0')
- conflicts('%clang@13:', when='+cuda ^cuda@:11.5.0')
+ conflicts('%gcc@12:', when='+cuda ^cuda@:11.6')
+ conflicts('%clang@13:', when='+cuda ^cuda@:11.5')
+ conflicts('%clang@14:', when='+cuda ^cuda@:11.6')
# https://gist.github.com/ax3l/9489132#gistcomment-3860114
conflicts('%gcc@10', when='+cuda ^cuda@:11.4.0')