summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authoralbestro <9337627+albestro@users.noreply.github.com>2021-11-24 10:49:51 +0100
committerGitHub <noreply@github.com>2021-11-24 02:49:51 -0700
commit635984f0773afa79534cd163ae2e2af0cfd5221c (patch)
tree7a1822dd87f61bfc5456c9cd0066748a13290246 /var
parent70d5d234db670532afa2644a030f488d65181249 (diff)
downloadspack-635984f0773afa79534cd163ae2e2af0cfd5221c.tar.gz
spack-635984f0773afa79534cd163ae2e2af0cfd5221c.tar.bz2
spack-635984f0773afa79534cd163ae2e2af0cfd5221c.tar.xz
spack-635984f0773afa79534cd163ae2e2af0cfd5221c.zip
umpire: fix gcc@10.3.0 conflict (#27620)
Make sure that `gcc@10.3.0-[number]` also matches the conflict.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/umpire/package.py5
1 files changed, 2 insertions, 3 deletions
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