diff options
| author | Mark H Weaver <mhw@netris.org> | 2018-03-16 01:14:02 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2018-03-16 05:02:10 -0400 |
| commit | 4e50f1f2d3cd6e60c1370c62d699ed6ac6460275 (patch) | |
| tree | 3f3995904fb46898e93417656681a44a530d3a22 /gnu | |
| parent | bf8e8a742836626135060818adbe76b2aa09714c (diff) | |
| download | guix-4e50f1f2d3cd6e60c1370c62d699ed6ac6460275.tar.gz | |
gnu: glibc/hurd: Use invoke instead of system*.
* gnu/packages/base.scm (glibc/hurd)[arguments]: In the build phase procedure, use 'invoke' instead of 'system*' and remove the vestigial result code plumbing. Change the local macro 'make' into a normal procedure.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/base.scm | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 336a2f9cba..a6da2f7eca 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2012 Nikita Karetnikov <nikita@karetnikov.org> -;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org> +;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014 Alex Kost <alezost@gmail.com> ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <manolis837@gmail.com> ;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il> @@ -805,14 +805,13 @@ with the Linux kernel.") ;; Force mach/hurd/libpthread subdirs to build first in order to avoid ;; linking errors. ;; See <https://lists.gnu.org/archive/html/bug-hurd/2016-11/msg00045.html> - (let ((-j (list "-j" (number->string (parallel-job-count))))) - (let-syntax ((make (syntax-rules () - ((_ target) - (zero? (apply system* "make" target -j)))))) - (and (make "mach/subdir_lib") - (make "hurd/subdir_lib") - (make "libpthread/subdir_lib") - (zero? (apply system* "make" -j))))))))) + (let ((flags (list "-j" (number->string (parallel-job-count))))) + (define (make target) + (apply invoke "make" target flags)) + (make "mach/subdir_lib") + (make "hurd/subdir_lib") + (make "libpthread/subdir_lib") + (apply invoke "make" flags)))))) ((#:configure-flags original-configure-flags) `(append (list "--host=i586-pc-gnu" |