ocaml: support 4.11 (#18705)
This commit is contained in:
parent
7d0a46c051
commit
403ea4384e
@ -15,6 +15,7 @@ class Ocaml(Package):
|
|||||||
|
|
||||||
maintainers = ['scemama']
|
maintainers = ['scemama']
|
||||||
|
|
||||||
|
version('4.11.0', sha256='b5bd04bf794a676389b167633f01f8275acdd853149b137f7575f2c2ddef1377')
|
||||||
version('4.10.0', sha256='58d431dde66f5750ebe9b15d5a1c4872f80d283dec23448689b0d1a498b7e4c7')
|
version('4.10.0', sha256='58d431dde66f5750ebe9b15d5a1c4872f80d283dec23448689b0d1a498b7e4c7')
|
||||||
version('4.09.0', sha256='2b728f8a0e90da14f22fdc04660f2ab33819cdbb12bff0ceae3fdbb0133cf7a6')
|
version('4.09.0', sha256='2b728f8a0e90da14f22fdc04660f2ab33819cdbb12bff0ceae3fdbb0133cf7a6')
|
||||||
version('4.08.1', sha256='ee50118ee88472fd4b64311fa560f8f8ab66a1899f0117815c69a16070980f78')
|
version('4.08.1', sha256='ee50118ee88472fd4b64311fa560f8f8ab66a1899f0117815c69a16070980f78')
|
||||||
@ -50,11 +51,18 @@ def install(self, spec, prefix):
|
|||||||
# to use correct assembler. (See #17918)
|
# to use correct assembler. (See #17918)
|
||||||
if self.spec.satisfies('%fj'):
|
if self.spec.satisfies('%fj'):
|
||||||
filter_file(
|
filter_file(
|
||||||
'${toolpref}clang -c -Wno-trigraphs',
|
'aspp="${toolpref}clang -c -Wno-trigraphs"',
|
||||||
spack_cc + ' -c',
|
'aspp="{0} -c"'.format(spack_cc),
|
||||||
'configure',
|
'configure',
|
||||||
string=True
|
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))
|
configure(*(base_args))
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user