nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ocaml@4.01: Enable building on aarch64-linux. 

This reverts 454e7132d6.

* gnu/packages/ocaml.scm (ocaml@4.01)[supported-systems]: Remove field.
[arguments]: When building on aarch64-linux, replace the custom
'configure script.
This commit is contained in:
Efraim Flashner 2018-12-02 13:04:37 +02:00
parent f764868d37
commit c661f25a94
No known key found for this signature in database
GPG Key ID: 41AAE7DCCA3D8351
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnu/packages/ocaml.scm
View File

@ -249,6 +249,17 @@ functional, imperative and object-oriented styles of programming.")
(lambda _
;; Specifying '-j' at all causes the build to fail.
(zero? (system* "make" "world.opt"))))
,@(if (string=? "aarch64-linux" (%current-system))
;; Custom configure script doesn't recongnize aarch64.
'((replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(mandir (string-append out "/share/man")))
(invoke "./configure"
"--prefix" out
"--mandir" mandir
"-host" "armv8l-unknown-linux-gnu")))))
'())
(replace 'check
(lambda _
(with-directory-excursion "testsuite"
@ -256,8 +267,7 @@ functional, imperative and object-oriented styles of programming.")
"make"
"all"
(string-append
"TOPDIR=" (getcwd) "/.."))))))))))
(supported-systems (delete "aarch64-linux" %supported-systems))))
"TOPDIR=" (getcwd) "/.."))))))))))))
(define-public ocaml-4.07
(package