diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-14 07:46:15 +0200 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2023-07-14 07:46:15 +0200 |
| commit | d67507cacf934b970f67567bced4e044c3ca9753 (patch) | |
| tree | b1c3160946ceaf74a9a24c7360d28036230210e1 /gnu/packages/bootloaders.scm | |
| parent | 3b3d9a13dd2bd67f34c890047680a1ce6e3af28e (diff) | |
| parent | dd4c1992103a65b8fbdc80fe07a9fe9be822769a (diff) | |
Merge branch 'master' into gnome-team
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index a9685a9ef9..01fd1093ff 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2022 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de> -;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> +;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -665,7 +665,7 @@ tree binary files. These are board description files used by Linux and BSD.") (sha256 (base32 "1y5x8vxdgsqdqlsvq01mn8lmw53fqairkhvhhjx83hjva0m4id2h")))) - (build-system gnu-build-system) + (build-system gnu-build-system) (native-inputs (list bison dtc @@ -1484,10 +1484,13 @@ grub-efi-netboot-removable-bootloader.") "U_BOOT_DATE \"Jan 01 1969\"") (("U_BOOT_TIME \"%T\"") "U_BOOT_TIME \"00:00:00\"")))) - (add-before 'build 'adjust-for-gcc10 + (add-before 'build 'adjust-for-current-gcc (lambda _ - (copy-file "include/linux/compiler-gcc6.h" - "include/linux/compiler-gcc10.h") + (let ((gcc-major-version #$(version-major + (package-version gcc)))) + (copy-file "include/linux/compiler-gcc6.h" + (string-append "include/linux/compiler-gcc" + gcc-major-version ".h"))) (substitute* "arch/arm/Makefile" (("march=armv5") "march=armv5te")))) |