From nobody Fri Jan 07 20:26:22 2022 X-Original-To: dev-commits-src-main@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 643A71947C64; Fri, 7 Jan 2022 20:26:23 +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 4JVvrH0k2hz4ysd; Fri, 7 Jan 2022 20:26:23 +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 E8F9E11D57; Fri, 7 Jan 2022 20:26:22 +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 207KQMiM082652; Fri, 7 Jan 2022 20:26:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 207KQMZr082651; Fri, 7 Jan 2022 20:26:22 GMT (envelope-from git) Date: Fri, 7 Jan 2022 20:26:22 GMT Message-Id: <202201072026.207KQMZr082651@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: adc88b9c01b5 - main - Build libclang also if LLDB is enabled List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: adc88b9c01b5d7a51c896091b291afbdae42b02a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641587183; 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=Bo1OP2Gk3DD0sSn/SI+IEtj4DoPQUB2wcqXG63akI6I=; b=blOscuxbgmykWUptgqOvOV9SGjgVDYX4c8WepLtCRzZLkovDZfhc/1w8G2IHnl9IZ6e1oA jjCiNFOAnl6N7cHBrC/9V/WPi5DoHRTU+vrqsctEpp3DWa61Zp14l3ipOK8YoIrBcWrIRv Ab4D60Q1Mr7xA5bJ22lfEqD/FAVfI8Lu9zsKV0Rv8CBpP8zuACqLtAcycCCxCqj8hA0TDu MCfO40xROi9uDmjyjO5n6KZ+7e8EUKfdp+V+G02Nc/o7oyo8Oz/3TaYXj7BmtHdxkALOMp ATxP/8V8vI6t3NztTyCC6crt3g1Aj5G9Wr4erjgQsL0Q6p7wNBUqsJHfSB5bmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641587183; a=rsa-sha256; cv=none; b=psXBQUC0EanCys1g5AaKA6MAyjAWWxHbXhpaqTjMiqpLJ9suA/4ZyprF/Fo9jbVInPrNpb FrTd03isWiJpkh9E+RJ1sdOWLb4YgcvhHdfW9EWHgKbV/fhOuc9/CM/burppnbp03gAKIQ XbYMUJByljDL2DfiJU/7JrwYuH2WK2NvAsq9mM0tg9MZYd3wlbuN5GxFGtHNhkWGPgqZn0 ewBFA6JbtTXWYJ7HRiJH4MU2PWcGuWtrGWDd7KKbe/JiEcpkFNaXwVKWTHVW2hZD6w0UU7 3xd3/6BKMB2SI2RJgLbcvF1UPEF77QxizDuhHETSt4NdB/3au7WFvvhkCjAnmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=adc88b9c01b5d7a51c896091b291afbdae42b02a commit adc88b9c01b5d7a51c896091b291afbdae42b02a Author: Ed Maste AuthorDate: 2022-01-07 15:34:08 +0000 Commit: Ed Maste CommitDate: 2022-01-07 20:23:55 +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 --- Makefile.inc1 | 3 ++- lib/clang/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 2cc00beed80d..b31c1d09fbeb 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2343,7 +2343,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