diff options
| author | Pierre Langlois <pierre.langlois@gmx.com> | 2021-11-27 01:18:06 +0000 |
|---|---|---|
| committer | Pierre Langlois <pierre.langlois@gmx.com> | 2021-11-27 14:23:30 +0000 |
| commit | 48b754553aeb98660fe145633616a9d965fbd60e (patch) | |
| tree | f36e403eda0f481233b2ef5de702868650d03c92 /gnu | |
| parent | 0c7d3243393deedd85b471012fc543421c3e7671 (diff) | |
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.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/make-bootstrap.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/packages/make-bootstrap.scm b/gnu/packages/make-bootstrap.scm index 267adde48c5..4ea97368a99 100644 --- a/gnu/packages/make-bootstrap.scm +++ b/gnu/packages/make-bootstrap.scm | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | ;;; Copyright © 2018, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 6 | ;;; Copyright © 2018, 2019, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> |
| 7 | ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> | 7 | ;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com> |
| 8 | ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> | 8 | ;;; Copyright © 2020 Mathieu Othacehe <m.othacehe@gmail.com> |
| 9 | ;;; Copyright © 2021 Pierre Langlois <pierre.langlois@gmx.com> | ||
| 9 | ;;; | 10 | ;;; |
| 10 | ;;; This file is part of GNU Guix. | 11 | ;;; This file is part of GNU Guix. |
| 11 | ;;; | 12 | ;;; |
| @@ -86,6 +87,12 @@ for `sh' in $PATH, and without nscd, and with static NSS modules." | |||
| 86 | "--enable-static-nss" | 87 | "--enable-static-nss" |
| 87 | ,flags)))) | 88 | ,flags)))) |
| 88 | 89 | ||
| 90 | ;; Make sure to build glibc with the same compiler version as the rest | ||
| 91 | ;; of the bootstrap. Otherwise it fails to statically link on aarch64. | ||
| 92 | (native-inputs | ||
| 93 | `(("gcc" ,gcc-7) | ||
| 94 | ,@(package-native-inputs base))) | ||
| 95 | |||
| 89 | ;; Remove the 'debug' output to allow bit-reproducible builds (when the | 96 | ;; Remove the 'debug' output to allow bit-reproducible builds (when the |
| 90 | ;; 'debug' output is used, ELF files end up with a .gnu_debuglink, which | 97 | ;; 'debug' output is used, ELF files end up with a .gnu_debuglink, which |
| 91 | ;; includes a CRC of the corresponding debugging symbols; those symbols | 98 | ;; includes a CRC of the corresponding debugging symbols; those symbols |
