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

gnu-dist: Use invoke instead of system*. 

* guix/build/gnu-dist.scm (autoreconf, build): Use invoke and remove vestigial
plumbing.
This commit is contained in:
Mark H Weaver 2018-03-16 03:16:11 -04:00
parent 7ac1b4084f
commit 6d084076b4
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
guix/build/gnu-dist.scm
View File

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -41,24 +42,22 @@
(begin (begin
(format #t "bootstrapping with `~a'...~%" (format #t "bootstrapping with `~a'...~%"
file) file)
(zero? (invoke (string-append "./" file)))
(system* (string-append "./" file))))
(try-files files ... (try-files files ...
(else fallback ...))))))) (else fallback ...)))))))
(try-files "bootstrap" "bootstrap.sh" "autogen" "autogen.sh" (try-files "bootstrap" "bootstrap.sh" "autogen" "autogen.sh"
(else (else
(format #t "bootstrapping with `autoreconf'...~%") (format #t "bootstrapping with `autoreconf'...~%")
(zero? (system* "autoreconf" "-vfi")))))) (invoke "autoreconf" "-vfi")))))
(define* (build #:key build-before-dist? make-flags (dist-target "distcheck") (define* (build #:key build-before-dist? make-flags (dist-target "distcheck")
#:allow-other-keys #:allow-other-keys
#:rest args) #:rest args)
(and (or (not build-before-dist?) (when build-before-dist?
(let ((build (assq-ref %standard-phases 'build))) (let ((build (assq-ref %standard-phases 'build)))
(apply build args))) (apply build args)))
(begin (format #t "building target `~a'~%" dist-target)
(format #t "building target `~a'~%" dist-target) (apply invoke "make" dist-target make-flags))
(zero? (apply system* "make" dist-target make-flags)))))
(define* (install-dist #:key outputs #:allow-other-keys) (define* (install-dist #:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))