gnu: make-bootstrap: Adjust for GCC7.
This is a follow-up to commit 01e8263feb
.
* gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc): Add the
GCC7 'treat-glibc-as-system-header' build phase.
master
parent
b45a97ea84
commit
e050aa1990
|
@ -4,6 +4,7 @@
|
||||||
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
|
||||||
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
|
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
|
||||||
;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
||||||
|
;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -116,9 +117,24 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
|
||||||
("gcc" ,(package (inherit gcc)
|
("gcc" ,(package (inherit gcc)
|
||||||
(outputs '("out")) ;all in one so libgcc_s is easily found
|
(outputs '("out")) ;all in one so libgcc_s is easily found
|
||||||
(inputs
|
(inputs
|
||||||
`(("libc" ,(glibc-for-bootstrap))
|
`(;; Distinguish the name so we can refer to it below.
|
||||||
|
("bootstrap-libc" ,(glibc-for-bootstrap))
|
||||||
("libc:static" ,(glibc-for-bootstrap) "static")
|
("libc:static" ,(glibc-for-bootstrap) "static")
|
||||||
,@(package-inputs gcc)))))
|
,@(package-inputs gcc)))
|
||||||
|
(arguments
|
||||||
|
(substitute-keyword-arguments (package-arguments gcc)
|
||||||
|
((#:phases phases)
|
||||||
|
`(modify-phases ,phases
|
||||||
|
(add-before 'configure 'treat-glibc-as-system-header
|
||||||
|
(lambda* (#:key inputs #:allow-other-keys)
|
||||||
|
(let ((libc (assoc-ref inputs "bootstrap-libc")))
|
||||||
|
;; GCCs build processes requires that the libc
|
||||||
|
;; we're building against is on the system header
|
||||||
|
;; search path.
|
||||||
|
(for-each (lambda (var)
|
||||||
|
(setenv var (string-append libc "/include")))
|
||||||
|
'("C_INCLUDE_PATH" "CPLUS_INCLUDE_PATH"))
|
||||||
|
#t)))))))))
|
||||||
,@(fold alist-delete (%final-inputs) '("libc" "gcc")))))
|
,@(fold alist-delete (%final-inputs) '("libc" "gcc")))))
|
||||||
|
|
||||||
(package-with-explicit-inputs p inputs
|
(package-with-explicit-inputs p inputs
|
||||||
|
|
Loading…
Reference in New Issue