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
This commit is contained in:
Efraim Flashner 2024-10-09 19:49:35 +03:00
parent 2bb3da06fd
commit de4798ff44
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351

View file

@ -1804,15 +1804,8 @@ (define gcc-mesboot1
(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"))))))))