branch core-updates-frozen updated: gnu: glibc-for-bootstrap: Build with GCC 7.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

planglois pushed a commit to branch core-updates-frozen
in repository guix.

The following commit(s) were added to refs/heads/core-updates-frozen by this 
push:
     new 48b7545  gnu: glibc-for-bootstrap: Build with GCC 7.
48b7545 is described below

commit 48b754553aeb98660fe145633616a9d965fbd60e
Author: Pierre Langlois <pierre.langlois@gmx.com>
AuthorDate: Sat Nov 27 01:18:06 2021 +0000

    gnu: glibc-for-bootstrap: Build with GCC 7.
    
    Fixes <https://issues.guix.gnu.org/52066>.
    
    * gnu/packages/make-bootstrap.scm (glibc-for-bootstrap)[native-inputs]:
    Add gcc-7.
---
 gnu/packages/make-bootstrap.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm
index 267adde..4ea9736 100644
--- a/gnu/packages/make-bootstrap.scm
+++ b/gnu/packages/make-bootstrap.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2018, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -86,6 +87,12 @@ for `sh' in $PATH, and without nscd, and with static NSS 
modules."
                   "--enable-static-nss"
                   ,flags))))
 
+      ;; Make sure to build glibc with the same compiler version as the rest
+      ;; of the bootstrap.  Otherwise it fails to statically link on aarch64.
+      (native-inputs
+       `(("gcc" ,gcc-7)
+         ,@(package-native-inputs base)))
+
       ;; Remove the 'debug' output to allow bit-reproducible builds (when the
       ;; 'debug' output is used, ELF files end up with a .gnu_debuglink, which
       ;; includes a CRC of the corresponding debugging symbols; those symbols