From 1e8912c79a70ec219ac8ca1af3ab20e42b735481 Mon Sep 17 00:00:00 2001

From: Javier Martinez Canillas <javierm@redhat.com>

Date: Tue, 13 Apr 2021 18:01:50 +0200

Subject: [PATCH] uefi-capsule: Don't set gnu-efi lib dir path when using

 custom crt0

The libefi.a and libgnuefi.a libraries are located in /usr/lib64 in RHEL8,

not in /usr/lib/gnuefi/$gnu_efi_arch/ as is the case in Fedora. This leads

to the linker not finding these libraries.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>

---

 plugins/uefi-capsule/efi/meson.build | 1 -

 1 file changed, 1 deletion(-)

diff --git a/plugins/uefi-capsule/efi/meson.build b/plugins/uefi-capsule/efi/meson.build

index 99654184a20..543474c0311 100644

--- plugins/uefi-capsule/efi/meson.build

+++ plugins/uefi-capsule/efi/meson.build

@@ -80,7 +80,6 @@ if host_cpu == 'aarch64' or host_cpu == 'arm'

     if cmd.returncode() != 0

       warning('Cannot find SBAT section in @0@, using local copy'.format(join_paths(efi_crtdir, arch_crt_source)))

       # The gnuefi libraries are still needed

-      efi_libdir = efi_crtdir

       efi_crtdir = join_paths(meson.current_build_dir(), 'crt0')

     endif

   endif

-- 

2.30.2