nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: gcc-stripped: Use invoke instead of system*. 

* gnu/packages/make-bootstrap.scm (gcc-stripped)[arguments]: Use invoke.  All
phases return #t.
This commit is contained in:
Mark H Weaver 2018-03-16 06:31:22 -04:00
parent d70d59d6f4
commit c2af3b0725
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/make-bootstrap.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; 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++")) (string-append includedir "/c++"))
;; For native builds, check whether the binaries actually work. ;; For native builds, check whether the binaries actually work.
,(if (%current-target-system) ,@(if (%current-target-system)
'#t '()
'(every (lambda (prog) '((for-each (lambda (prog)
(zero? (system* (string-append gcc "/bin/" prog) (invoke (string-append gcc "/bin/" prog)
"--version"))) "--version"))
'("gcc" "g++" "cpp"))))))) '("gcc" "g++" "cpp"))))
#t))))
(inputs `(("gcc" ,%gcc-static))))) (inputs `(("gcc" ,%gcc-static)))))
(define %guile-static (define %guile-static