From nobody Mon Jan 10 00:26:18 2022 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 E4AE6193ECE8; Mon, 10 Jan 2022 00:26:18 +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 4JXF4B4VrPz54mh; Mon, 10 Jan 2022 00:26:18 +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 786EE1BD2F; Mon, 10 Jan 2022 00:26:18 +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 20A0QI0K046015; Mon, 10 Jan 2022 00:26:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20A0QI8B046014; Mon, 10 Jan 2022 00:26:18 GMT (envelope-from git) Date: Mon, 10 Jan 2022 00:26:18 GMT Message-Id: <202201100026.20A0QI8B046014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8402f6341ee3 - stable/13 - Build libclang also if LLDB is enabled 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8402f6341ee331ae8d273e609dafa7359455491d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641774378; 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=HiqLor3mKL7TP7z1APg3t9AKy6DRLfuwZDh0TetqtlA=; b=Hxs7yUnhpESjB51Y+ffmzI2PjJOJcVzTpt/Fq0ug5qtMtt+EUDSv2j3ZPlL63J8zDRkhDT 80el8HidMu4L60ppdSuGK8F2C7uJf4O8xnjFUMMYclEKCGiXfcSdaB9qg4AmM8mqGCRJel Dp4liiuF28L6np+zXBYtzKieR+FsXCGE2MojKN3ONdLReK3Wexxjncw32mfKO6UqUxvRzY bfO2r7wsS9Pidn/HZHwA06B33EuZF5hDRkKYHigCFYYe4FlIfDsTxIw/hOZeSnTxCHRoA4 SHtBR3Al6laQzuzmWhw6m2zfhiMttaEx49mGXSOmxDEUNYX9Xc8gX5FHLWtJXA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641774378; a=rsa-sha256; cv=none; b=SBX6EWV/T1Pi59kCAZE8Kr/lvcs6Y+AtoIsUThIpYNzNJdSmiU4y15gxOjUuclnQ64V8yR OXoHxdw+8bHTjo+inLkQZD8wtOdk4scI8l0h+AF5jSeiC1GOd0Z/gC/zBGMYalUvk//5sK qXT8S9eJEWWkhA2fmNC1tze/KwOQq1H/W3S+R1VSYPHHC+3fgazUV0142CeitkrADq7SBE 4KlDpVF7gPY9fnP+b1ZUZv5nXNWZawc8lnZVFX3gdJ5cbYvdtSYpLi9JoHsEAHAAfp+T+Z fbxhX/eS+m63wHwIcZC++IMIgUS5BwI+QBMZret/LT5eR1XtY9vRzlZhhjYiYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8402f6341ee331ae8d273e609dafa7359455491d commit 8402f6341ee331ae8d273e609dafa7359455491d Author: Ed Maste AuthorDate: 2022-01-07 15:34:08 +0000 Commit: Ed Maste CommitDate: 2022-01-10 00:25:11 +0000 Build libclang also if LLDB is enabled LLDB depends on libclang as it uses Clang as the expression parser. Previously setting WITHOUT_CLANG but leaving LLDB enabled (as default) resulted in a build failure. Users who set WITHOUT_CLANG in order to reduce build time or size might want to set WITHOUT_LLDB in addition to WITHOUT_CLANG, or use WITHOUT_TOOLCHAIN instead. PR: 260993 Reported by: eugen Reviewed by: dim MFC after: 3 days Sponsored by: The FreeBSD Foundation (cherry picked from commit adc88b9c01b5d7a51c896091b291afbdae42b02a) --- Makefile.inc1 | 3 ++- lib/clang/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 1726ae046d76..86f78a1ae204 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2341,7 +2341,8 @@ _gensnmptree= usr.sbin/bsnmpd/gensnmptree _clang_tblgen= \ lib/clang/libllvmminimal \ usr.bin/clang/llvm-tblgen -.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" +.if ${MK_CLANG_BOOTSTRAP} != "no" || ${MK_CLANG} != "no" || \ + ${MK_LLDB} != "no" _clang_tblgen+= usr.bin/clang/clang-tblgen .endif .if ${MK_LLDB} != "no" diff --git a/lib/clang/Makefile b/lib/clang/Makefile index df4aa01a2653..cbb2c2a7175f 100644 --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -4,7 +4,7 @@ # These have to be built in order. SUBDIR= libllvm -.if ${MK_CLANG} != "no" +.if ${MK_CLANG} != "no" || ${MK_LLDB} != "no" SUBDIR+= libclang SUBDIR+= headers .endif