mhw pushed a commit to branch core-updates
in repository guix.
commit 4e50f1f2d3cd6e60c1370c62d699ed6ac6460275
Author: Mark H Weaver <[email protected]>
Date: Fri Mar 16 01:14:02 2018 -0400
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(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index 336a2f9..a6da2f7 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
<[email protected]>
;;; Copyright © 2014 Andreas Enge <[email protected]>
;;; Copyright © 2012 Nikita Karetnikov <[email protected]>
-;;; Copyright © 2014, 2015, 2016 Mark H Weaver <[email protected]>
+;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <[email protected]>
;;; Copyright © 2014 Alex Kost <[email protected]>
;;; Copyright © 2014, 2015 Manolis Fragkiskos Ragkousis <[email protected]>
;;; Copyright © 2016, 2017 Efraim Flashner <[email protected]>
@@ -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"
