Skip to content

Commit 138312e

Browse files
authored
clingo-bootstrap: account for cray platform (#22460)
1 parent 364b359 commit 138312e

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

  • var/spack/repos/builtin/packages/clingo-bootstrap

var/spack/repos/builtin/packages/clingo-bootstrap/package.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,11 @@ class ClingoBootstrap(Clingo):
2424
]:
2525
conflicts('%{0}'.format(compiler_spec), when='platform=linux',
2626
msg='GCC is required to bootstrap clingo on Linux')
27-
conflicts('%gcc@:5.99.99', when='platform=linux',
28-
msg='C++14 support is required to bootstrap clingo on Linux')
27+
conflicts('%{0}'.format(compiler_spec), when='platform=cray',
28+
msg='GCC is required to bootstrap clingo on Cray')
29+
conflicts(
30+
'%gcc@:5.99.99', msg='C++14 support is required to bootstrap clingo'
31+
)
2932

3033
# On Darwin we bootstrap with Apple Clang
3134
for compiler_spec in [
@@ -41,7 +44,8 @@ class ClingoBootstrap(Clingo):
4144
def setup_build_environment(self, env):
4245
if '%apple-clang platform=darwin' in self.spec:
4346
opts = '-mmacosx-version-min=10.13'
44-
elif '%gcc platform=linux' in self.spec:
47+
elif '%gcc' in self.spec:
48+
# This is either linux or cray
4549
opts = '-static-libstdc++ -static-libgcc -Wl,--exclude-libs,ALL'
4650
else:
4751
msg = 'unexpected compiler for spec "{0}"'.format(self.spec)

0 commit comments

Comments
 (0)