From 23996d940a63359465021277d4b2f5b569054379 Mon Sep 17 00:00:00 2001 From: Ahmad Khalifa Date: Sun, 31 May 2026 03:02:06 +0300 Subject: [PATCH] stand/efi/Makefile: fix build order Move liblua32efi and ficl32efi before .WAIT, otherwise there's a race between the interpreter and the loader being built. Reported by: kbowling Discussed with: kevans Fixes: d15cc7625dde9bcb6a63ee59cccf14f3b93b15bf --- stand/efi/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stand/efi/Makefile b/stand/efi/Makefile index 5ece7eff8ef..db4cbc1a0b1 100644 --- a/stand/efi/Makefile +++ b/stand/efi/Makefile @@ -5,9 +5,6 @@ NO_OBJ=t SUBDIR.yes+= libefi SUBDIR.${MK_LOADER_IA32}+= libsa32efi libefi32 SUBDIR.${MK_FDT}+= fdt -SUBDIR.yes+= .WAIT - -SUBDIR.yes+= boot1 gptboot .if ${LOADER_DEFAULT_INTERP} == "lua" SUBDIR.${MK_LOADER_IA32}+= liblua32efi @@ -15,6 +12,10 @@ SUBDIR.${MK_LOADER_IA32}+= liblua32efi SUBDIR.${MK_LOADER_IA32}+= ficl32efi .endif +SUBDIR.yes+= .WAIT + +SUBDIR.yes+= boot1 gptboot + SUBDIR.${MK_FORTH}+= loader_4th SUBDIR.${MK_LOADER_LUA}+= loader_lua SUBDIR.${MK_LOADER_IA32}+= loader_ia32