From ed4a468941334fb9e7e3cbba3e170a2a1204332a Mon Sep 17 00:00:00 2001 From: Michael Kuhn Date: Wed, 10 Mar 2021 15:52:40 +0100 Subject: 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. --- var/spack/repos/builtin/packages/gcc/package.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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') -- cgit v1.2.3-70-g09d2