summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorMichael Kuhn <michael.kuhn@ovgu.de>2021-03-10 15:52:40 +0100
committerGitHub <noreply@github.com>2021-03-10 14:52:40 +0000
commited4a468941334fb9e7e3cbba3e170a2a1204332a (patch)
treed3a55a6555383edfe00d34366ff10313069d62b3 /var
parentdf92f73c72d11cc6e7ac65320425d669e16c612c (diff)
downloadspack-ed4a468941334fb9e7e3cbba3e170a2a1204332a.tar.gz
spack-ed4a468941334fb9e7e3cbba3e170a2a1204332a.tar.bz2
spack-ed4a468941334fb9e7e3cbba3e170a2a1204332a.tar.xz
spack-ed4a468941334fb9e7e3cbba3e170a2a1204332a.zip
gcc: fix nvptx conflict (#22214)
In the past, we only had the binutils variant, which included the bootstrapping flag. Now that we have a separate bootstrap variant, fix the nvptx conflict accordingly.
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 240217660d..61e2e5d5a6 100644
--- a/var/spack/repos/builtin/packages/gcc/package.py
+++ b/var/spack/repos/builtin/packages/gcc/package.py
@@ -212,7 +212,7 @@ class Gcc(AutotoolsPackage, GNUMirrorPackage):
conflicts('languages=objc', when='+nvptx')
conflicts('languages=obj-c++', when='+nvptx')
# NVPTX build disables bootstrap
- conflicts('+binutils', when='+nvptx')
+ conflicts('+bootstrap', when='+nvptx')
# Binutils can't build ld on macOS
conflicts('+binutils', when='platform=darwin')