git: 75e5f5916e0e - main - boot1.efi: Don't redundantly include devpath.c

From: Warner Losh <imp_at_FreeBSD.org>
Date: Tue, 07 May 2024 14:54:25 UTC
The branch main has been updated by imp:

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

commit 75e5f5916e0eb01f573c1dfcb4625b16eec30124
Author:     Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-05-07 02:06:54 +0000
Commit:     Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-05-07 14:53:50 +0000

    boot1.efi: Don't redundantly include devpath.c
    
    devpath.c is on both the comand line and in libefi. This is redundant
    and was a mistake in 4cf36aa1017f9. It never should have been here. In
    practice, this just means that the devpath.o from libefi.a goes unused.
    This will cause problems with some upcoming changes (D44872) to enable
    LTO to reduce the size of the binaries, so go ahead and make the change
    now to reduce the changeset for that. No functional change indended.
    
    Fixes:          4cf36aa1017f9
    Co-authored-by: sobomax
    Sponsored by:   Netflix
---
 stand/efi/boot1/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile
index fd5069004dff..fb1c7d74eec1 100644
--- a/stand/efi/boot1/Makefile
+++ b/stand/efi/boot1/Makefile
@@ -29,7 +29,7 @@ CWARNFLAGS.zfs_module.c += -Wno-unused-parameter
 CWARNFLAGS.zfs_module.c += -Wno-unused-function
 
 # architecture-specific loader code
-SRCS+=	boot1.c proto.c self_reloc.c start.S ufs_module.c devpath.c
+SRCS+=	boot1.c proto.c self_reloc.c start.S ufs_module.c
 .if ${MK_LOADER_ZFS} != "no"
 SRCS+=		zfs_module.c
 CFLAGS.zfs_module.c+=	-I${ZFSSRC}
@@ -58,7 +58,6 @@ CFLAGS+=	-DEFI_DEBUG
 .PATH:		${EFISRC}/loader/arch/${MACHINE}
 .PATH:		${EFISRC}/loader
 .PATH:		${LDRSRC}
-.PATH:		${EFISRC}/libefi
 CFLAGS+=	-I${LDRSRC}
 
 FILES=	${BOOT1}.efi