From: Luca Boccassi <bluca@debian.org>
Date: Sun, 9 Jul 2023 13:39:05 +0000 (+0100)
Subject: efi: skip libefitest if 'bootloader' is explicitly set to false
X-Git-Tag: v254-rc2~58
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4729e84e01c095f21b7d83bccbfd9ebccefeac73;p=thirdparty%2Fsystemd.git

efi: skip libefitest if 'bootloader' is explicitly set to false

On x32 efi_arch will be set as the kernel architecture is just x86_64,
but there's no userland support to build the EFI ABI. When -Dbootloader=false
is set, skip libefitest too.
---

diff --git a/meson.build b/meson.build
index 661663f12f5..78d7c3dd5f3 100644
--- a/meson.build
+++ b/meson.build
@@ -2124,6 +2124,9 @@ efi_arch = {
 
 if get_option('bootloader') != 'false' and efi_arch != ''
         conf.set_quoted('EFI_MACHINE_TYPE_NAME', efi_arch)
+elif get_option('bootloader') == 'false' and efi_arch != ''
+        # Ensure that if the option is explicitly set to false, then no EFI code is built, including tests
+        efi_arch = ''
 elif get_option('bootloader') == 'true' and efi_arch == ''
         error('EFI not supported for this arch.')
 endif