From 71b7b353d8934286a03c5c9a327e948e091810e8 Mon Sep 17 00:00:00 2001
From: ketsubouchi <67359246+ketsubouchi@users.noreply.github.com>
Date: Tue, 18 Aug 2020 18:49:09 +0900
Subject: [PATCH] ocaml: fix building with Fujitsu compilers (#17918)
---
var/spack/repos/builtin/packages/ocaml/package.py | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/var/spack/repos/builtin/packages/ocaml/package.py b/var/spack/repos/builtin/packages/ocaml/package.py
index 4e642b9f56..66b2dc41e5 100644
--- a/var/spack/repos/builtin/packages/ocaml/package.py
+++ b/var/spack/repos/builtin/packages/ocaml/package.py
@@ -44,6 +44,17 @@ def install(self, spec, prefix):
if self.spec.satisfies('~force-safe-string'):
base_args += ['--disable-force-safe-string']
+ # This patch is aarch64-linux-fj only.
+ # However, similar patch is needed for other arch/OS/compiler
+ # to use correct assembler. (See #17918)
+ if self.spec.satisfies('%fj'):
+ filter_file(
+ '${toolpref}clang -c -Wno-trigraphs',
+ spack_cc + ' -c',
+ 'configure',
+ string=True
+ )
+
configure(*(base_args))
make('world.opt')
--
GitLab