Skip to content

Commit

Permalink
stand: ensure that the efi directory's dependencies are correct
Browse files Browse the repository at this point in the history
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
MFC-after:	3 days
  • Loading branch information
kevans91 committed Jan 27, 2021
1 parent 24a8f6d commit 7012461
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions stand/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,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
Expand Down

0 comments on commit 7012461

Please sign in to comment.