From 7f58848a324cd5ff1a297a4d7ab2c7fbae990967 Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@arm.com>
Date: Thu, 10 Aug 2023 17:24:46 +0100
Subject: systemd-boot: improve cross file generation

The meson.cross generated by the class already has c and objcopy
entries, so these can be removed.

Pass the --cross-file option in MESON_CROSS_FILE to ensure the ordering
is always correct.

(From OE-Core rev: 302551de19edb1eb7333a6d1d5fdddacdbb9c349)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-core/systemd/systemd-boot_254.bb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-core/systemd/systemd-boot_254.bb b/meta/recipes-core/systemd/systemd-boot_254.bb
index 1b8ff6e3ab..642a5fafe7 100644
--- a/meta/recipes-core/systemd/systemd-boot_254.bb
+++ b/meta/recipes-core/systemd/systemd-boot_254.bb
@@ -13,22 +13,21 @@ LDFLAGS:prepend = "${@ " ".join(d.getVar('LD').split()[1:])} "
 EFI_LD = "bfd"
 LDFLAGS:append = " -fuse-ld=${EFI_LD}"
 
-do_write_config[vardeps] += "CC OBJCOPY EFI_LD"
+do_write_config[vardeps] += "EFI_LD"
 do_write_config:append() {
     cat >${WORKDIR}/meson-${PN}.cross <<EOF
 [binaries]
-c = ${@meson_array('CC', d)}
-objcopy = ${@meson_array('OBJCOPY', d)}
 c_ld = ${@meson_array('EFI_LD', d)}
 EOF
 }
 
+MESON_CROSS_FILE:append = " --cross-file ${WORKDIR}/meson-${PN}.cross"
+
 MESON_TARGET = "systemd-boot"
 
 EXTRA_OEMESON += "-Defi=true \
                   -Dbootloader=true \
                   -Dman=false \
-                  --cross-file ${WORKDIR}/meson-${PN}.cross \
                   "
 
 # install to the image as boot*.efi if its the EFI_PROVIDER,
-- 
cgit v1.2.3-54-g00ecf