guix-commits
[Top][All Lists]
Advanced

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

02/36: gnu: libstdc++-doc: Use invoke.


From: Mark H. Weaver
Subject: 02/36: gnu: libstdc++-doc: Use invoke.
Date: Thu, 12 Apr 2018 04:09:17 -0400 (EDT)

mhw pushed a commit to branch core-updates
in repository guix.

commit 61a815ebeba6168594dd08b2e77b9b86d4477c60
Author: Mark H Weaver <address@hidden>
Date:   Fri Mar 16 01:48:45 2018 -0400

    gnu: libstdc++-doc: Use invoke.
    
    * gnu/packages/gcc.scm (make-libstdc++-doc)[arguments]: Use invoke.
---
 gnu/packages/gcc.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index 27f4b04..3fc95fa 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -769,7 +769,8 @@ as the 'native-search-paths' field."
        #:phases (modify-phases %standard-phases
                   (add-before 'configure 'chdir
                               (lambda _
-                                (chdir "libstdc++-v3")))
+                                (chdir "libstdc++-v3")
+                                #t))
                   (add-before 'configure 'set-xsl-directory
                               (lambda* (#:key inputs #:allow-other-keys)
                                 (let ((docbook (assoc-ref inputs 
"docbook-xsl")))
@@ -778,22 +779,23 @@ as the 'native-search-paths' field."
                                     (("@XSL_STYLE_DIR@")
                                      (string-append
                                       docbook "/xml/xsl/"
-                                      (strip-store-file-name docbook)))))))
+                                      (strip-store-file-name docbook))))
+                                  #t)))
                   (replace 'build
                            (lambda _
                              ;; XXX: There's also a 'doc-info' target, but it
                              ;; relies on docbook2X, which itself relies on
                              ;; DocBook 4.1.2, which is not really usable
                              ;; (lacks a catalog.xml.)
-                             (zero? (system* "make"
-                                             "doc-html"
-                                             "doc-man"))))
+                             (invoke "make"
+                                     "doc-html"
+                                     "doc-man")))
                   (replace 'install
                            (lambda* (#:key outputs #:allow-other-keys)
                              (let ((out (assoc-ref outputs "out")))
-                               (zero? (system* "make"
-                                               "doc-install-html"
-                                               "doc-install-man"))))))))))
+                               (invoke "make"
+                                       "doc-install-html"
+                                       "doc-install-man")))))))))
 
 (define-public libstdc++-doc-4.9
   (make-libstdc++-doc gcc-4.9))



reply via email to

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