diff options
| author | Kyle Evans <kevans@FreeBSD.org> | 2021-01-01 06:22:48 +0000 |
|---|---|---|
| committer | Kyle Evans <kevans@FreeBSD.org> | 2021-01-01 06:22:48 +0000 |
| commit | 8b4c3a03f933b77b65c78fdef976831d27942d9d (patch) | |
| tree | 0820f1d83a4a5582ab86c82fc2b816b3e89d53c6 | |
| parent | b58a46347c8dd81137ef164fba1ab6b60c5b94c4 (diff) | |
| download | src-8b4c3a03f933b77b65c78fdef976831d27942d9d.tar.gz src-8b4c3a03f933b77b65c78fdef976831d27942d9d.zip | |
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.
| -rw-r--r-- | stand/Makefile | 8 |
1 files changed, 7 insertions, 1 deletions
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 |