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

gnu: cross-base: Use invoke in (gnu build cross-toolchain). 

* gnu/build/cross-toolchain.scm (set-cross-path/mingw, install-strip): Use
invoke.
This commit is contained in:
Mark H Weaver 2018-03-23 02:16:14 -04:00
parent dcd5ea699f
commit 3e629738a3
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/build/cross-toolchain.scm
View File

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; 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 Jan Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2016 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; 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. ;; libc is false, so we are building xgcc-sans-libc.
;; Add essential headers from mingw-w64. ;; Add essential headers from mingw-w64.
(let ((mingw-source (assoc-ref inputs "mingw-source"))) (let ((mingw-source (assoc-ref inputs "mingw-source")))
(system* "tar" "xvf" mingw-source) (invoke "tar" "xvf" mingw-source)
(let ((mingw-headers (unpacked-mingw-dir))) (let ((mingw-headers (unpacked-mingw-dir)))
;; We need _mingw.h which will gets built from _mingw.h.in by ;; We need _mingw.h which will gets built from _mingw.h.in by
;; mingw-w64's configure. We cannot configure mingw-w64 until we ;; mingw-w64's configure. We cannot configure mingw-w64 until we
@ -160,7 +160,7 @@ C_*INCLUDE_PATH."
"Install a stripped GCC." "Install a stripped GCC."
;; Unlike our 'strip' phase, this will do the right thing for ;; Unlike our 'strip' phase, this will do the right thing for
;; cross-compilers. ;; cross-compilers.
(zero? (system* "make" "install-strip"))) (invoke "make" "install-strip"))
(define* (cross-gcc-build-phases target (define* (cross-gcc-build-phases target
#:optional (phases %standard-phases)) #:optional (phases %standard-phases))