summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-03-23 02:16:14 -0400
committerMark H Weaver <mhw@netris.org>2018-03-23 04:41:53 -0400
commit3e629738a3acd908acc510023c85db448e3553c3 (patch)
tree884c7a377e7e9c62c1bfa253d259ea3349618b6c
parentdcd5ea699fe4f7e8c1f53933e4d0e027c1a0a512 (diff)
downloadguix-3e629738a3acd908acc510023c85db448e3553c3.tar.gz
gnu: cross-base: Use invoke in (gnu build cross-toolchain).
* gnu/build/cross-toolchain.scm (set-cross-path/mingw, install-strip): Use
invoke.
-rw-r--r--gnu/build/cross-toolchain.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/build/cross-toolchain.scm b/gnu/build/cross-toolchain.scm
index 450443ca63..d430b8afc4 100644
--- a/gnu/build/cross-toolchain.scm
+++ b/gnu/build/cross-toolchain.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
-;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com>
 ;;;
@@ -119,7 +119,7 @@ C_*INCLUDE_PATH."
         ;; libc is false, so we are building xgcc-sans-libc.
         ;; Add essential headers from mingw-w64.
         (let ((mingw-source (assoc-ref inputs "mingw-source")))
-          (system* "tar" "xvf" mingw-source)
+          (invoke "tar" "xvf" mingw-source)
           (let ((mingw-headers (unpacked-mingw-dir)))
             ;; We need _mingw.h which will gets built from _mingw.h.in by
             ;; mingw-w64's configure.  We cannot configure mingw-w64 until we
@@ -160,7 +160,7 @@ C_*INCLUDE_PATH."
   "Install a stripped GCC."
   ;; Unlike our 'strip' phase, this will do the right thing for
   ;; cross-compilers.
-  (zero? (system* "make" "install-strip")))
+  (invoke "make" "install-strip"))
 
 (define* (cross-gcc-build-phases target
                                  #:optional (phases %standard-phases))