197/207: Oops, libstdc++ build fixes WIP

[Jan Nieuwenhuizen]

janneke pushed a commit to branch wip-bootstrap
in repository guix.

commit 10d0ef6b7c6c1649e508f69f64885f1fe3e9cf56
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Wed Sep 5 16:00:58 2018 +0200

    Oops, libstdc++ build fixes WIP
    
    * gnu/packages/commencement.scm (glibc-mesboot): Also add 
C_PLUS_INCLUDE_PATH
    to native search paths.
---
 gnu/packages/commencement.scm | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 10e4030..4c8c832 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1249,7 +1249,6 @@ ac_cv_c_float_format='IEEE (little-endian)'
      (source #f)
      (inputs '())
      (native-inputs `(("bash" ,%bootstrap-coreutils&co)
-                      ;;("libc" ,%bootstrap-glibc)
                       ("libc" ,glibc-mesboot)
                       ("gcc" ,gcc-mesboot)))
      (arguments
@@ -1433,7 +1432,22 @@ exec " gcc "/bin/" program
                            (install-flags (cons "install" make-flags)))
                       (and (apply invoke "make" install-flags)
                            (copy-recursively kernel-headers out)
-                           #t))))))))))))
+                           #t)))))))))
+     (native-search-paths ;; FIXME: move to glibc-mesboot0
+      ;; Use the language-specific variables rather than 'CPATH' because they
+      ;; are equivalent to '-isystem' whereas 'CPATH' is equivalent to '-I'.
+      ;; The intent is to allow headers that are in the search path to be
+      ;; treated as "system headers" (headers exempt from warnings) just like
+      ;; the typical /usr/include headers on an FHS system.
+      (list (search-path-specification
+             (variable "C_INCLUDE_PATH")
+             (files '("include")))
+            (search-path-specification
+             (variable "CPLUS_INCLUDE_PATH")
+             (files '("include")))
+            (search-path-specification
+             (variable "LIBRARY_PATH")
+             (files '("lib"))))))))
 
 (define-public m4-mesboot
   (package-with-bootstrap-guile