From 4729e84e01c095f21b7d83bccbfd9ebccefeac73 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Sun, 9 Jul 2023 14:39:05 +0100 Subject: [PATCH] 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. --- meson.build | 3 +++ 1 file changed, 3 insertions(+) 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 -- 2.47.3