summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2021-03-22 23:57:32 +0100
committerMassimiliano Culpo <massimiliano.culpo@gmail.com>2021-05-21 19:42:12 +0200
commit6c1b348d912175ce49141386cee8d79d8035269b (patch)
tree6ff43d6e23678c0154818dc83ce64160617b7fa9
parent68ef6fce92766601a34fa5bc221f0e9e0dba09d5 (diff)
downloadspack-6c1b348d912175ce49141386cee8d79d8035269b.tar.gz
spack-6c1b348d912175ce49141386cee8d79d8035269b.tar.bz2
spack-6c1b348d912175ce49141386cee8d79d8035269b.tar.xz
spack-6c1b348d912175ce49141386cee8d79d8035269b.zip
clingo-bootstrap: account for cray platform (#22460)
(cherry picked from commit 138312efabd534fa42d1a16e172e859f0d2b5842)
-rw-r--r--var/spack/repos/builtin/packages/clingo-bootstrap/package.py10
1 files changed, 7 insertions, 3 deletions
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)