From b8d042273a1b966585be386b55c9b3f96895f3a5 Mon Sep 17 00:00:00 2001 From: Alberto Invernizzi <9337627+albestro@users.noreply.github.com> Date: Mon, 21 Feb 2022 20:28:56 +0100 Subject: Bring back cuda@11.4.0 conflicts for GCC and clang; add 11.4.3:11.4.4 (#29076) Co-authored-by: Harmen Stoppels --- lib/spack/spack/build_systems/cuda.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/spack/spack/build_systems/cuda.py b/lib/spack/spack/build_systems/cuda.py index 1c46086c63..1b85f82cc4 100644 --- a/lib/spack/spack/build_systems/cuda.py +++ b/lib/spack/spack/build_systems/cuda.py @@ -106,7 +106,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.6') + conflicts('%clang@12:', when='+cuda ^cuda@:11.4.0') conflicts('%clang@13:', when='+cuda ^cuda@:11.5') conflicts('%clang@14:', when='+cuda ^cuda@:11.6') -- cgit v1.2.3-60-g2f50