guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/14: gnu: ocaml-4.01: Use INVOKE.


From: guix-commits
Subject: 02/14: gnu: ocaml-4.01: Use INVOKE.
Date: Fri, 25 Jan 2019 08:02:32 -0500 (EST)

rekado pushed a commit to branch master
in repository guix.

commit fa5d6e4c6f0f56d8a909d401f7015f156c20c178
Author: Ricardo Wurmus <address@hidden>
Date:   Fri Jan 25 13:23:27 2019 +0100

    gnu: ocaml-4.01: Use INVOKE.
    
    * gnu/packages/ocaml.scm (ocaml-4.01)[arguments]: Use INVOKE in build 
phases.
---
 gnu/packages/ocaml.scm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 3731b2a..cf6580e 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -12,6 +12,7 @@
 ;;; Copyright © 2018 Peter Kreye <address@hidden>
 ;;; Copyright © 2018, 2019 Gabriel Hondet <address@hidden>
 ;;; Copyright © 2018 Kei Kebreau <address@hidden>
+;;; Copyright © 2019 Ricardo Wurmus <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -253,7 +254,7 @@ functional, imperative and object-oriented styles of 
programming.")
            (replace 'build
              (lambda _
                ;; Specifying '-j' at all causes the build to fail.
-               (zero? (system* "make" "world.opt"))))
+               (invoke "make" "world.opt")))
            ,@(if (string=? "aarch64-linux" (%current-system))
                ;; Custom configure script doesn't recongnize aarch64.
                '((replace 'configure
@@ -268,11 +269,9 @@ functional, imperative and object-oriented styles of 
programming.")
            (replace 'check
              (lambda _
                (with-directory-excursion "testsuite"
-                 (zero? (system*
-                         "make"
-                         "all"
+                 (invoke "make" "all"
                          (string-append
-                          "TOPDIR=" (getcwd) "/.."))))))))))))
+                          "TOPDIR=" (getcwd) "/..")))))))))))
 
 (define-public ocaml-4.07
   (package



reply via email to

[Prev in Thread] Current Thread [Next in Thread]