guix_mirror_bot pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 513d35d7884e9bd5e9ea2539f48c8d9ce83a1d38
Author: Efraim Flashner <efr...@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 bea5d972ed..9fe3330f80 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1840,7 +1840,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)
