Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 31 May 2026 12:16:29 +0000
From:      Ahmad Khalifa <vexeduxr@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 23996d940a63 - main - stand/efi/Makefile: fix build order
Message-ID:  <6a1c269d.4593f.39515ed2@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by vexeduxr:

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

commit 23996d940a63359465021277d4b2f5b569054379
Author:     Ahmad Khalifa <vexeduxr@FreeBSD.org>
AuthorDate: 2026-05-31 00:02:06 +0000
Commit:     Ahmad Khalifa <vexeduxr@FreeBSD.org>
CommitDate: 2026-05-31 11:48:05 +0000

    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 5ece7eff8ef2..db4cbc1a0b1a 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


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6a1c269d.4593f.39515ed2>