gnu-dist: Use invoke instead of system*.
* guix/build/gnu-dist.scm (autoreconf, build): Use invoke and remove vestigial plumbing.master
parent
7ac1b4084f
commit
6d084076b4
|
@ -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)
|
||||||
(zero? (apply system* "make" dist-target make-flags)))))
|
(apply invoke "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"))
|
||||||
|
|
Reference in New Issue