From nobody Mon Jan 10 00:27:02 2022 X-Original-To: dev-commits-src-all@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 2694E193F711; Mon, 10 Jan 2022 00:27:03 +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 4JXF525tXbz55GW; Mon, 10 Jan 2022 00:27:02 +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 AAB8B1BD82; Mon, 10 Jan 2022 00:27:02 +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 20A0R20i046187; Mon, 10 Jan 2022 00:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20A0R2TN046186; Mon, 10 Jan 2022 00:27:02 GMT (envelope-from git) Date: Mon, 10 Jan 2022 00:27:02 GMT Message-Id: <202201100027.20A0R2TN046186@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: 620d156421e2 - stable/12 - Build libclang also if LLDB is enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: 620d156421e249269a4e957a6ad22957308f880f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641774422; 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=Ho2JyTDPt3ESgoZ1LcJApdtcHml991YfJFo4jLKYXPY=; b=RqpMunqQd3xEen9ZitFGxcFYNrjMUnNKhV3gHHs0TwrSV/VFuSNxv0dchKoYCCc7bOhItc 3Jfc8fhFH+FmIAKOfgui0rpCSSotY9troeOdOH1TnGpHgcRsAqVncnHaa5xw+U/iTpGDGJ mqG7JZKYqp8WV0cYsCbv7Vdft0coMfHOhPWknndyzHkZF6SbJzSRWCCgzaaQwlnVJc684D GTzELYYIdWjQ3OSy9jbIop+HWBd9pbH5Ne9GNkP/mjCVwSm48GuD+7V/CV+9adNnM6h/7P s4AgeKcNVafgh/n+WmutOEaVhOMMHE2y2HpX0SCsovZrQ7DM8nrdzaCkbstBqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641774422; a=rsa-sha256; cv=none; b=vxILyzkC5EJmDDCwbbCinfRnHZYnYDAgn4TWNDD+NbIZNg+U5HUYYRl5K1wd5sEdaj13Ii fensAWzuxSFOQ8PYrVDOn12rhU35sYg7QJs+luefUFk2ioYkZ9OR4T8F+W8+nOZ9DR9r7/ SL/HU2bLxIYpRpNTwA2LFFbuIi0CHuc3Q3kRGw/345Jl0mMuurDXNvmv2cawmbZ50xtgd4 UXbqDmHIXE41LcaNvaxiit7WvVBKNU6UJJeHqUxXNY9oIBcH0iuQbLp5pRo/3nfH4ehdJs tU+pPM1Obbkcsyd86W4oEWHuontBusia/vetGYuKjku+C+aT3hiimepXP76uqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=620d156421e249269a4e957a6ad22957308f880f commit 620d156421e249269a4e957a6ad22957308f880f Author: Ed Maste AuthorDate: 2022-01-07 15:34:08 +0000 Commit: Ed Maste CommitDate: 2022-01-10 00:25:50 +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 4852a73756f1..c9777d1d45d3 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2197,7 +2197,8 @@ _localedef= usr.bin/localedef _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