zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

umpire: fix gcc@10.3.0 conflict (#27620)

Browse Source 
Make sure that `gcc@10.3.0-[number]` also matches the conflict.
This commit is contained in:
albestro 2021-11-24 10:49:51 +01:00 committed by GitHub
parent 70d5d234db
commit 635984f077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
var/spack/repos/builtin/packages/umpire/package.py
View File

@ -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