From c2af3b0725a25daa0b66a9943334ed997478b985 Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Fri, 16 Mar 2018 06:31:22 -0400 Subject: gnu: gcc-stripped: Use invoke instead of system*. * gnu/packages/make-bootstrap.scm (gcc-stripped)[arguments]: Use invoke. All phases return #t. --- gnu/packages/make-bootstrap.scm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'gnu/packages/make-bootstrap.scm') diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index e779376df9..eaef4c89c2 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès ;;; Copyright © 2017 Efraim Flashner ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Mark H Weaver ;;; ;;; This file is part of GNU Guix. ;;; @@ -494,12 +495,14 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." (string-append includedir "/c++")) ;; For native builds, check whether the binaries actually work. - ,(if (%current-target-system) - '#t - '(every (lambda (prog) - (zero? (system* (string-append gcc "/bin/" prog) - "--version"))) - '("gcc" "g++" "cpp"))))))) + ,@(if (%current-target-system) + '() + '((for-each (lambda (prog) + (invoke (string-append gcc "/bin/" prog) + "--version")) + '("gcc" "g++" "cpp")))) + + #t)))) (inputs `(("gcc" ,%gcc-static))))) (define %guile-static -- cgit v1.2.3