me
/
guix
Archived
1
0
Fork 0
Code

gnu: bootstrap-gcc: Don't use CPATH search paths. 

This updates the bootstrap-gcc to use the same search path strategy as
the main compilers, making the bootstrap environment more similar across
architectures, and fixing the bootstrap path on non-x86 architectures
again.

This is a follow up to commit 7cde865f12.

* gnu/packages/bootstrap.scm (%bootstrap-gcc)[native-search-paths]: Use
  C_INCLUDE_PATH and CPLUS_INCLUDE_PATH instead of CPATH.
master
Jakub Kądziołka 2020-08-02 22:17:11 +02:00
parent 5324e66f9d
commit fe6775f52b
No known key found for this signature in database
GPG Key ID: E315A75846131564
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/bootstrap.scm
View File

@ -5,6 +5,7 @@
;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; Copyright © 2019 Carl Dong <contact@carldong.me> ;;; Copyright © 2019 Carl Dong <contact@carldong.me>
;;; Copyright © 2019 Léo Le Bouter <lle-bout@zaclys.net> ;;; Copyright © 2019 Léo Le Bouter <lle-bout@zaclys.net>
;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -740,8 +741,11 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \
"1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks")))))))))
(native-search-paths (native-search-paths
(list (search-path-specification (list (search-path-specification
(variable "CPATH") (variable "C_INCLUDE_PATH")
(files '("include"))) (files '("include")))
(search-path-specification
(variable "CPLUS_INCLUDE_PATH")
(files '("include/c++" "include")))
(search-path-specification (search-path-specification
(variable "LIBRARY_PATH") (variable "LIBRARY_PATH")
(files '("lib" "lib64"))))) (files '("lib" "lib64")))))