From 4e50f1f2d3cd6e60c1370c62d699ed6ac6460275 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Mar 2018 01:14:02 -0400 Subject: 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. --- gnu/packages/base.scm | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'gnu') 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 ;;; Copyright © 2014 Andreas Enge ;;; Copyright © 2012 Nikita Karetnikov -;;; Copyright © 2014, 2015, 2016 Mark H Weaver +;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver ;;; Copyright © 2014 Alex Kost ;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis ;;; Copyright © 2016, 2017 Efraim Flashner @@ -805,14 +805,13 @@ (define-public glibc/hurd ;; Force mach/hurd/libpthread subdirs to build first in order to avoid ;; linking errors. ;; See - (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" -- cgit v1.2.3