git: d9cd8a3d3fd5 - stable/12 - stand: ensure that the efi directory's dependencies are correct

Kyle Evans kevans at FreeBSD.org
Sun Jan 31 01:15:09 UTC 2021


The branch stable/12 has been updated by kevans:

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

commit d9cd8a3d3fd57109978afa157e749048d3b22ea7
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-27 18:54:07 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-31 01:15:00 +0000

    stand: ensure that the efi directory's dependencies are correct
    
    efi, like the various ${MACHINE} directories, should have a dependency on
    the enabled interpreters.
    
    The general rule here is that any top-level directory that has a program at
    any depth within that includes loader.mk should add ${INTERP_DEPENDS} added
    to its dependencies so that the appropriate ficl/lua bits are ready before
    they begin.
    
    Note that the only directories in-tree that require it but will not get it
    in a more appropriate manner are i386 (on amd64), efi, and userboot. i386
    and userboot are handled explicitly in Makefile.amd64 where they are added
    to S.yes.
    
    Reported-by:    bcran
    (cherry picked from commit 7012461c9bf6375cd0b14de16b3b4a753c5c1c7a)
---
 stand/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stand/Makefile b/stand/Makefile
index f0a3d65e1fb8..f00d072f73ae 100644
--- a/stand/Makefile
+++ b/stand/Makefile
@@ -74,6 +74,7 @@ SUBDIR_DEPEND_${_x}32+=	libsa32
 SUBDIR_DEPEND_forth+=	ficl
 SUBDIR_DEPEND_lua+=	liblua
 
+SUBDIR_DEPEND_efi+=	${INTERP_DEPENDS}
 .if ${MK_FDT} != "no"
 SUBDIR_DEPEND_efi+=	fdt
 .endif


More information about the dev-commits-src-all mailing list