From owner-dev-commits-src-all@freebsd.org Fri Jan 1 06:24:39 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8B04F4C0382; Fri, 1 Jan 2021 06:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D6ZkH2HlTz4Vlk; Fri, 1 Jan 2021 06:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 419F51E34C; Fri, 1 Jan 2021 06:24:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1016Od4O058925; Fri, 1 Jan 2021 06:24:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1016OdCb058924; Fri, 1 Jan 2021 06:24:39 GMT (envelope-from git) Date: Fri, 1 Jan 2021 06:24:39 GMT Message-Id: <202101010624.1016OdCb058924@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 8b4c3a03f933 - main - stand: fix WITHOUT_FORTH/WITHOUT_LOADER_LUA build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b4c3a03f933b77b65c78fdef976831d27942d9d Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Jan 2021 06:24:39 -0000 The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8b4c3a03f933b77b65c78fdef976831d27942d9d commit 8b4c3a03f933b77b65c78fdef976831d27942d9d Author: Kyle Evans AuthorDate: 2021-01-01 06:22:48 +0000 Commit: Kyle Evans 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