From 6c1b348d912175ce49141386cee8d79d8035269b Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Mon, 22 Mar 2021 23:57:32 +0100 Subject: clingo-bootstrap: account for cray platform (#22460) (cherry picked from commit 138312efabd534fa42d1a16e172e859f0d2b5842) --- var/spack/repos/builtin/packages/clingo-bootstrap/package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py index 06858da285..014ba12927 100644 --- a/var/spack/repos/builtin/packages/clingo-bootstrap/package.py +++ b/var/spack/repos/builtin/packages/clingo-bootstrap/package.py @@ -24,8 +24,11 @@ class ClingoBootstrap(Clingo): ]: conflicts('%{0}'.format(compiler_spec), when='platform=linux', msg='GCC is required to bootstrap clingo on Linux') - conflicts('%gcc@:5.99.99', when='platform=linux', - msg='C++14 support is required to bootstrap clingo on Linux') + conflicts('%{0}'.format(compiler_spec), when='platform=cray', + msg='GCC is required to bootstrap clingo on Cray') + conflicts( + '%gcc@:5.99.99', msg='C++14 support is required to bootstrap clingo' + ) # On Darwin we bootstrap with Apple Clang for compiler_spec in [ @@ -41,7 +44,8 @@ class ClingoBootstrap(Clingo): def setup_build_environment(self, env): if '%apple-clang platform=darwin' in self.spec: opts = '-mmacosx-version-min=10.13' - elif '%gcc platform=linux' in self.spec: + elif '%gcc' in self.spec: + # This is either linux or cray opts = '-static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL' else: msg = 'unexpected compiler for spec "{0}"'.format(self.spec) -- cgit v1.2.3-60-g2f50