summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMatthew Thompson <fortran@gmail.com>2023-03-23 13:03:09 -0400
committerGitHub <noreply@github.com>2023-03-23 13:03:09 -0400
commit862e9a59c4878d5b7d452f59fbcfa40f034ca6fa (patch)
tree91d382458cde274a8607bec60c7018a7412b5e95 /var
parent4dc9d9f60ec5e53b130ff06848524796eaca4bc3 (diff)
downloadspack-862e9a59c4878d5b7d452f59fbcfa40f034ca6fa.tar.gz
spack-862e9a59c4878d5b7d452f59fbcfa40f034ca6fa.tar.bz2
spack-862e9a59c4878d5b7d452f59fbcfa40f034ca6fa.tar.xz
spack-862e9a59c4878d5b7d452f59fbcfa40f034ca6fa.zip
gcc: fix for apple-clang conflicts (#36165)
* gcc: fix for apple-clang conflict * Update var/spack/repos/builtin/packages/gcc/package.py Use variant by @adamjstewart Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com> --------- Co-authored-by: Adam J. Stewart <ajstewart426@gmail.com>
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/gcc/package.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/var/spack/repos/builtin/packages/gcc/package.py b/var/spack/repos/builtin/packages/gcc/package.py
index e70d0bea9e..6270c9c47a 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -353,7 +353,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
conflicts("%gcc@:4.7", when="@11:")
# https://github.com/iains/gcc-12-branch/issues/6
- conflicts("%apple-clang@14.0")
+ conflicts("%apple-clang@14:14.0")
if sys.platform == "darwin":
# Fix parallel build on APFS filesystem