04/04: gnu: u-boot-ts7970-q-2g-1000mhz-c: Fix build.

[guix-commits]

apteryx pushed a commit to branch master
in repository guix.

commit 14888e5b25202047cd467461a4032326fe9de344
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jul 7 13:35:18 2023 -0400

    gnu: u-boot-ts7970-q-2g-1000mhz-c: Fix build.
    
    * gnu/packages/bootloaders.scm (u-boot-ts-mx6) [arguments]: Replace
    adjust-for-gcc10 phase with adjust-for-current-gcc.
---
 gnu/packages/bootloaders.scm | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm
index 1fee6f3aa2..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.
 ;;;
@@ -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"))))