git: e35cc7ba3fd2 - main - edk2: Update to not build libefivar for lib32 on amd64

From: Warner Losh <imp_at_FreeBSD.org>
Date: Wed, 23 Apr 2025 21:35:57 UTC
The branch main has been updated by imp:

URL: https://cgit.FreeBSD.org/src/commit/?id=e35cc7ba3fd2f9886ec7058de949b3eaf6be1a65

commit e35cc7ba3fd2f9886ec7058de949b3eaf6be1a65
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2025-04-23 21:28:20 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2025-04-23 21:28:20 +0000

    edk2: Update to not build libefivar for lib32 on amd64
    
    This dropped from the last commit because I had to redo it so many
    times...
    
    edk2 headers just aren't setup for the weird, hybrid enviornment we're
    compiling in when building i386 libraries for amd64 lib32. Since we
    can't use it there anyway (there's no 32-bit efibootmgr or efivar), and
    native i386 doesn't have them (we don't support EFI Runtime Services on
    i386 because we don't support EFI booting there).
    
    Sponsored by:           Netflix
---
 lib/Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Makefile b/lib/Makefile
index 1f69b4208738..1924df391072 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -186,7 +186,10 @@ _libclang_rt=	libclang_rt
 .error Requested build with sanitizers but cannot build runtime libraries!
 .endif
 
+# This construct disables libefivar for 32-bit build.
+.if ${MACHINE_CPUARCH} != "i386"
 SUBDIR.${MK_EFI}+=	libefivar
+.endif
 SUBDIR.${MK_GOOGLETEST}+=	googletest
 SUBDIR.${MK_NETGRAPH}+=	libnetgraph
 SUBDIR.${MK_NIS}+=	libypclnt