hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert 19736 because conflicts are avoided by clingo by default (#26721)

Browse source
This commit is contained in:
Harmen Stoppels 2021-10-18 08:41:35 +02:00 committed by GitHub
parent 9c7e71df34
commit 33ef7d57c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 87 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/spack/spack/build_systems/cuda.py
View file

@ -5,7 +5,6 @@
import spack.variant import spack.variant
from spack.directives import conflicts, depends_on, variant from spack.directives import conflicts, depends_on, variant
from spack.multimethod import when
from spack.package import PackageBase from spack.package import PackageBase
@ -88,7 +87,7 @@ def cuda_flags(arch_list):
# Linux x86_64 compiler conflicts from here: # Linux x86_64 compiler conflicts from here:
# https://gist.github.com/ax3l/9489132 # https://gist.github.com/ax3l/9489132
with when('^cuda~allow-unsupported-compilers'):
# GCC # GCC
# According to # According to
# https://github.com/spack/spack/pull/25054#issuecomment-886531664 # https://github.com/spack/spack/pull/25054#issuecomment-886531664

2
var/spack/repos/builtin/packages/cuda/package.py
View file

@ -122,8 +122,6 @@ class Cuda(Package):
conflicts('arch=darwin-mojave-x86_64') conflicts('arch=darwin-mojave-x86_64')
variant('dev', default=False, description='Enable development dependencies, i.e to use cuda-gdb') variant('dev', default=False, description='Enable development dependencies, i.e to use cuda-gdb')
variant('allow-unsupported-compilers', default=False,
description='Allow unsupported host compiler and CUDA version combinations')
depends_on('libxml2', when='@10.1.243:') depends_on('libxml2', when='@10.1.243:')
# cuda-gdb needs libncurses.so.5 # cuda-gdb needs libncurses.so.5