From 635984f0773afa79534cd163ae2e2af0cfd5221c Mon Sep 17 00:00:00 2001 From: albestro <9337627+albestro@users.noreply.github.com> Date: Wed, 24 Nov 2021 10:49:51 +0100 Subject: umpire: fix gcc@10.3.0 conflict (#27620) Make sure that `gcc@10.3.0-[number]` also matches the conflict. --- var/spack/repos/builtin/packages/umpire/package.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/umpire/package.py b/var/spack/repos/builtin/packages/umpire/package.py index 228226e415..873ab86a63 100644 --- a/var/spack/repos/builtin/packages/umpire/package.py +++ b/var/spack/repos/builtin/packages/umpire/package.py @@ -104,9 +104,8 @@ class Umpire(CachedCMakePackage, CudaPackage, ROCmPackage): # https://github.com/LLNL/Umpire/issues/653 # This range looks weird, but it ensures the concretizer looks at it as a - # range, not as a concrete version, so that it also matches compilers - # specified as `gcc@10.3.0-identifier`. See #8957. - conflicts('%gcc@10.3.0:10.3.0.0', when='+cuda') + # range, not as a concrete version, so that it also matches 10.3.* versions. + conflicts('%gcc@10.3.0:10.3', when='+cuda') def _get_sys_type(self, spec): sys_type = spec.architecture -- cgit v1.2.3-60-g2f50