From fe6775f52b7f28a5bf74633ea4737c32a64b7e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20K=C4=85dzio=C5=82ka?= Date: Sun, 2 Aug 2020 22:17:11 +0200 Subject: [PATCH] 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 7cde865f12dd67e55946a52a21103e71f447eced. * gnu/packages/bootstrap.scm (%bootstrap-gcc)[native-search-paths]: Use C_INCLUDE_PATH and CPLUS_INCLUDE_PATH instead of CPATH. --- gnu/packages/bootstrap.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index c39e60ec8b..fee2ae1199 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019 Carl Dong ;;; Copyright © 2019 Léo Le Bouter +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -740,8 +741,11 @@ exec ~a/bin/.gcc-wrapped -B~a/lib \ "1m5miqkyng45l745n0sfafdpjkqv9225xf44jqkygwsipj2cv9ks"))))))))) (native-search-paths (list (search-path-specification - (variable "CPATH") + (variable "C_INCLUDE_PATH") (files '("include"))) + (search-path-specification + (variable "CPLUS_INCLUDE_PATH") + (files '("include/c++" "include"))) (search-path-specification (variable "LIBRARY_PATH") (files '("lib" "lib64")))))