35/87: gnu: gcc-mesboot1: Fix native-search-paths.

[guix-commits]

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

commit 2bb3da06fd68bb8a17f59e8701b5fd80c50aede0
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Wed Oct 9 19:39:17 2024 +0300

    gnu: gcc-mesboot1: Fix native-search-paths.
    
    * gnu/packages/commencement.scm (gcc-mesboot1)[native-search-paths]:
    Don't inherit from gcc-core-mesboot1.  Add CPLUS_INCLUDE_PATH.
    
    Change-Id: I027e0722d6c63bd2b6222849f6bb82907e593da7
---
 gnu/packages/commencement.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 5c7caec4eb..ee8f802be9 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1815,7 +1815,17 @@ ac_cv_c_float_format='IEEE (little-endian)'
 
                 ;; Set the C++ search path so that C headers can be found as
                 ;; libstdc++ is being compiled.
-                (setenv "CPLUS_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))))))))))
+                (setenv "CPLUS_INCLUDE_PATH" (getenv "C_INCLUDE_PATH"))))))))
+    (native-search-paths
+     (list (search-path-specification
+            (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")))))))
 
 (define (%boot-mesboot2-inputs)
   `(("gcc" ,gcc-mesboot1)