From nobody Sat Dec 25 11:55:51 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 11D7F18F3343; Sat, 25 Dec 2021 11:55:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JLj7D5wMhz4lP7; Sat, 25 Dec 2021 11:55:52 +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 ABCD116E88; Sat, 25 Dec 2021 11:55:51 +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 1BPBtpkU006893; Sat, 25 Dec 2021 11:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BPBtpdf006892; Sat, 25 Dec 2021 11:55:51 GMT (envelope-from git) Date: Sat, 25 Dec 2021 11:55:51 GMT Message-Id: <202112251155.1BPBtpdf006892@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 31704f29a4b9 - stable/12 - Don't build lldb-tablegen if MK_LLDB=no List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 31704f29a4b9a2524424a8b0ff9cb6e35fdeae3d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640433353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vqMromZ8v5wansBcWZ82FKBvrL4vyJzCL9cXBJCKlF4=; b=SnuY3TFVvXMk73davYwv3NqyNAxwuhbhMjg5njXkrn605e8Cjhs1ihcc6kn1lak+xkC45n JfLl1r2bAK97biAKR/M1TIlfykDtpegNToWt3TiO5gX8fKI1f0R7wruFScyYIIgbnVCKE2 9381BVDV13Gv/ZegLtaOQEp649Ult23vDyNcAAmA4F5zxVJG1l3SUyqJgR0uiVP2xxanpA B1sl5XYkeAeAIhCKunZ6c8FC4xylpbf7mSi9Ug3WASWQKC0WqTm76HBsEwVw89x47x7WoD Q5mLa6lnFlqCb1wC9fJMC52Qqn/jfdhN3xJr5nPGNYz0QflHYJo5EEUaFTOEKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640433353; a=rsa-sha256; cv=none; b=Zq1eg3Sa2Sat+8fFcEP3dhW3jryvOGrJTYXD8dMgMfCAhmSzJTOuZV/9dWY5dq67wNuT54 IB2U6uB+rbkwFhVZtfmvUlmeiUvlyV/ywDeKVZq8EPRqVL6ueJQcdFtD/+88K2YO1x3Ffr kPku4BHJDiMIu1RKYjff20BXt2eIPc7O6iyeuDZD5laFdzBRsvpkf347Wd4jxpSxoxL7VJ HHC+KDtCh6hVdH5x2bv9FWRwFslzOCNbuKX/Xb2Im60tfJHfVNUzfmurk8pP92N0WsZUYU tOkAhQYEP/jlUo1YJx6J99llbnc90dxbOgc8/eqV0YGlgzXssggFIfwrCaB11Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=31704f29a4b9a2524424a8b0ff9cb6e35fdeae3d commit 31704f29a4b9a2524424a8b0ff9cb6e35fdeae3d Author: Alex Richardson AuthorDate: 2021-07-05 17:36:02 +0000 Commit: Dimitry Andric CommitDate: 2021-12-25 11:51:23 +0000 Don't build lldb-tablegen if MK_LLDB=no Split out from D31060. Reviewed by: emaste (cherry picked from commit c5d1d88a351abe869c436f4f70c85d4c29e6e98c) --- Makefile.inc1 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index a90eaf5d66a5..e4ccf47efe04 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2189,14 +2189,17 @@ _localedef= usr.bin/localedef # We need to build tblgen when we're building clang or lld, either as # bootstrap tools, or as the part of the normal build. .if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" || \ - ${MK_LLD_BOOTSTRAP} != "no" || ${MK_LLD} != "no" + ${MK_LLD_BOOTSTRAP} != "no" || ${MK_LLD} != "no" || \ + ${MK_LLDB} != "no" _clang_tblgen= \ lib/clang/libllvmminimal \ - usr.bin/clang/llvm-tblgen \ - usr.bin/clang/clang-tblgen \ - usr.bin/clang/lldb-tblgen -# XXX: lldb-tblgen is not needed, if top-level MK_LLDB=no - + usr.bin/clang/llvm-tblgen +.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" +_clang_tblgen+= usr.bin/clang/clang-tblgen +.endif +.if ${MK_LLDB} != "no" +_clang_tblgen+= usr.bin/clang/lldb-tblgen +.endif ${_bt}-usr.bin/clang/clang-tblgen: ${_bt}-lib/clang/libllvmminimal ${_bt}-usr.bin/clang/llvm-tblgen: ${_bt}-lib/clang/libllvmminimal ${_bt}-usr.bin/clang/lldb-tblgen: ${_bt}-lib/clang/libllvmminimal