git: 8b4c3a03f933 - main - stand: fix WITHOUT_FORTH/WITHOUT_LOADER_LUA build

Kyle Evans kevans at FreeBSD.org
Fri Jan 1 06:24:39 UTC 2021


The branch main has been updated by kevans:

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

commit 8b4c3a03f933b77b65c78fdef976831d27942d9d
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-01 06:22:48 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-01 06:22:48 +0000

    stand: fix WITHOUT_FORTH/WITHOUT_LOADER_LUA build
    
    Previously having ficl/liblua in LIB32LIST with their respective option
    turned OFF would be relatively harmless, as we wouldn't act on it unless we
    were building the non-32 variant. As of ac5f382a9d0a, however, these are
    now used for dependencies in some cases and must reflect what's actually
    going to be built.
---
 stand/Makefile | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/stand/Makefile b/stand/Makefile
index d7bcb4bfbca2..46e0856e45fd 100644
--- a/stand/Makefile
+++ b/stand/Makefile
@@ -6,7 +6,13 @@
 # others we don't. LIB32LIST is a list of libraries, which if
 # included, need to be built 32-bit as well.
 .if ${MACHINE_ARCH} == "amd64"
-LIB32LIST=libsa ficl liblua
+LIB32LIST=libsa
+.if ${MK_FORTH} != "no"
+LIB32LIST+=		ficl
+.endif
+.if ${MK_LOADER_LUA} != "no"
+LIB32LIST+=		liblua
+.endif
 .endif
 
 S.yes+=			libsa


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