guix_mirror_bot pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 1db59d173f51c0e42e027cd8b57692087eba5898
Author: Efraim Flashner <efr...@flashner.co.il>
AuthorDate: Wed Oct 9 19:49:35 2024 +0300
gnu: gcc-mesboot1: Adjust setting include paths.
* gnu/packages/commencement.scm (gcc-mesboot1)[arguments]: Don't replace
the 'setenv phase, add a 'set-cplus-include-path phase to set the
CPLUS_INCLUDE_PATH.
Change-Id: I58434bca416c07b43e147b598930ad4ea8382802
---
gnu/packages/commencement.scm | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 9fe3330f80..e41a81ea89 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1829,15 +1829,8 @@ ac_cv_c_float_format='IEEE (little-endian)'
(lambda _
(let ((source-g++ (assoc-ref %build-inputs "gcc-g++")))
(invoke "tar" "xvf" source-g++))))
- (replace 'setenv
+ (add-before 'configure 'set-cplus-include-path
(lambda _
- (setenv "CONFIG_SHELL" (which "sh"))
-
- ;; Allow MPFR headers to be found.
- (setenv "C_INCLUDE_PATH"
- (string-append (getcwd) "/mpfr/src:"
- (getenv "C_INCLUDE_PATH")))
-
;; 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"))))))))
