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

gnu: make-bootstrap: Adjust for GCC 7. 

* gnu/packages/make-bootstrap.scm (package-with-relocatable-glibc)[native-inputs]:
Add SEARCH-PATHS to CROSS-GCC, and NATIVE-SEARCH-PATHS to the native GCC.
This commit is contained in:
Marius Bakke 2019-06-21 09:37:21 +02:00
parent 7c836efacc
commit 25a54eb04d
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,16 +106,33 @@ for `sh' in $PATH, and without nscd, and with static NSS modules."
(define (native-inputs) (define (native-inputs)
(if (%current-target-system) (if (%current-target-system)
(let ((target (%current-target-system))) (let* ((target (%current-target-system))
`(("cross-gcc" ,(cross-gcc target (xgcc (cross-gcc
target
#:xbinutils (cross-binutils target) #:xbinutils (cross-binutils target)
#:libc (cross-bootstrap-libc))) #:libc (cross-bootstrap-libc))))
`(("cross-gcc" ,(package
(inherit xgcc)
(search-paths
;; Ensure the cross libc headers appears on the
;; C++ system header search path.
(cons (search-path-specification
(variable "CROSS_CPLUS_INCLUDE_PATH")
(files '("include")))
(package-search-paths gcc)))))
("cross-binutils" ,(cross-binutils target)) ("cross-binutils" ,(cross-binutils target))
,@(%final-inputs))) ,@(%final-inputs)))
`(("libc" ,(glibc-for-bootstrap)) `(("libc" ,(glibc-for-bootstrap))
("libc:static" ,(glibc-for-bootstrap) "static") ("libc:static" ,(glibc-for-bootstrap) "static")
("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
(native-search-paths
;; Set CPLUS_INCLUDE_PATH so GCC is able to find the libc
;; C++ headers.
(cons (search-path-specification
(variable "CPLUS_INCLUDE_PATH")
(files '("include")))
(package-native-search-paths gcc)))
(inputs (inputs
`(;; Distinguish the name so we can refer to it below. `(;; Distinguish the name so we can refer to it below.
("bootstrap-libc" ,(glibc-for-bootstrap)) ("bootstrap-libc" ,(glibc-for-bootstrap))