Subject: [bug#42681] [PATCH core-updates] gnu: bootstrap-gcc: Don't use CPATH search paths.

From: Jakub Kądziołka <[email-masked]>
Date: Sun, 2 Aug 2020 22:34:21 +0200

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.
---

Note: because I don't have any non-x86 machines on hand, I haven't
actually tested the patch yet.

Efraim, you have helped me investigate this with your ARM board, perhaps
you could test this patch?

Regards,
Jakub Kądziołka
 gnu/packages/bootstrap.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm
index c39e60ec8b..fd6c2e099c 100644
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@ -740,8 +740,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")))))
-- 
2.28.0