efraim pushed a commit to branch wip-riscv-bootstrap
in repository guix.
commit 8ce96684f23d83e4a3adddb6cce8a5574935aa7a
Author: Efraim Flashner <efr...@flashner.co.il>
AuthorDate: Tue Dec 17 09:21:08 2024 +0200
gnu: gcc-mesboot1: Backport c++ builtin values.
* gnu/packages/commencement.scm (gcc-mesboot1)[arguments]: Add a custom
phase backporting the correct definitions for __cplusplus.
Change-Id: Ia594fd8ae983c7cfe025fd606f66261e03574f7f
---
gnu/packages/commencement.scm | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 7a569e1125..9551323ca8 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -1932,6 +1932,21 @@ ac_cv_c_float_format='IEEE (little-endian)'
#$configure-flags))))
((#:phases phases)
#~(modify-phases #$phases
+ (add-after 'unpack 'adjust-builtin-cplusplus-variable
+ (lambda _
+ ;; These values are backported from later releases of GCC.
+ ;; See gcc commit 1fb80b0c5359f696aa61d537e25b7901d8b56ff7.
+ ;; See gcc commit 97e3ad20b12a5a317d98085df6f18a87f681f377
+ ;; if we need to recognize other flags.
+ (substitute* "libcpp/init.c"
+ (("_cpp_define_builtin \\(pfile, \"__cplusplus 1\"\\);")
+ (string-append "{
+ if (CPP_OPTION (pfile, lang) == CLK_CXX0X
+ || CPP_OPTION (pfile, lang) == CLK_GNUCXX0X)
+ _cpp_define_builtin (pfile, \"__cplusplus 201103L\");
+ else
+ _cpp_define_builtin (pfile, \"__cplusplus 199711L\");
+ }")))))
(add-before 'configure 'set-cplus-include-path
(lambda _
;; Set the C++ search path so that C headers can be found as
