summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorketsubouchi <kenta.tsubouchi@hac-inc.co.jp>2020-09-19 00:02:50 +0900
committerGitHub <noreply@github.com>2020-09-18 10:02:50 -0500
commit403ea4384e116415356704c81e0bc9cda02224e5 (patch)
tree08134295ae4483bd5fb9780e6012510c32fb9f35 /var
parent7d0a46c05136d1de7f28946e04336feca1318d34 (diff)
downloadspack-403ea4384e116415356704c81e0bc9cda02224e5.tar.gz
spack-403ea4384e116415356704c81e0bc9cda02224e5.tar.bz2
spack-403ea4384e116415356704c81e0bc9cda02224e5.tar.xz
spack-403ea4384e116415356704c81e0bc9cda02224e5.zip
ocaml: support 4.11 (#18705)
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/ocaml/package.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/ocaml/package.py b/var/spack/repos/builtin/packages/ocaml/package.py
index fba0a18051..406deeed36 100644
--- a/var/spack/repos/builtin/packages/ocaml/package.py
+++ b/var/spack/repos/builtin/packages/ocaml/package.py
@@ -15,6 +15,7 @@ class Ocaml(Package):
maintainers = ['scemama']
+ version('4.11.0', sha256='b5bd04bf794a676389b167633f01f8275acdd853149b137f7575f2c2ddef1377')
version('4.10.0', sha256='58d431dde66f5750ebe9b15d5a1c4872f80d283dec23448689b0d1a498b7e4c7')
version('4.09.0', sha256='2b728f8a0e90da14f22fdc04660f2ab33819cdbb12bff0ceae3fdbb0133cf7a6')
version('4.08.1', sha256='ee50118ee88472fd4b64311fa560f8f8ab66a1899f0117815c69a16070980f78')
@@ -50,11 +51,18 @@ class Ocaml(Package):
# to use correct assembler. (See #17918)
if self.spec.satisfies('%fj'):
filter_file(
- '${toolpref}clang -c -Wno-trigraphs',
- spack_cc + ' -c',
+ 'aspp="${toolpref}clang -c -Wno-trigraphs"',
+ 'aspp="{0} -c"'.format(spack_cc),
'configure',
string=True
)
+ if self.spec.satisfies('@4.11.0:'):
+ filter_file(
+ 'as="${toolpref}clang -c -Wno-trigraphs"',
+ 'as="${toolpref}as"',
+ 'configure',
+ string=True
+ )
configure(*(base_args))