From nobody Mon Nov 29 15:11:25 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 2C16418AC8E5; Mon, 29 Nov 2021 15:11:26 +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 4J2phs6PLzz4bld; Mon, 29 Nov 2021 15:11:25 +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 BD65524A1E; Mon, 29 Nov 2021 15:11:25 +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 1ATFBP8I022620; Mon, 29 Nov 2021 15:11:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATFBPJc022619; Mon, 29 Nov 2021 15:11:25 GMT (envelope-from git) Date: Mon, 29 Nov 2021 15:11:25 GMT Message-Id: <202111291511.1ATFBPJc022619@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: 8f02234dbd1d - stable/13 - Don't build sanitizer runtimes under WITHOUT_CXX 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: 8f02234dbd1d578740b08afb4a0d6b877432adc9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638198685; 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=SjQa7YA6ps2ufo1wWXU+FSO2oMNBftLvLKn9JmruUnQ=; b=oWXmJj8GCnvJuhF18Y+fvvlmUurBiN6mck5OMwOUGx2oOUzxgk8c6bXtPSEdLbYMU9Lnvs /IemXXMzHpIDrFBz/f3bw/4U0FOfRP35Ob8xC4QY9cps6ZM+Bb7xhIvOJ/kIYw00wlrFVK XjjpkWiI+0/A/LeWvChS+qvPWmwMsTBq8v6RcN2NWA5Oei7i7vfFmOAvXd8JwXBdM5vl/o /0jVPP3wt7ACsXgg3y3yhALUvQGS+zOLqTcATeSIP97j/bZ1kTb+ZMPjI81Ds+20a2fYBM DNF1ImgCkVP5gBOuYecc4rPnkCTSOlLO0j2a97LTqWb8QVsQLA6guLt3utlCNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638198685; a=rsa-sha256; cv=none; b=IGoSY2C9a3TOSy5O0xX2QuUjkuaoogYipJtG1gV1gIzfUJ2I2XteSzQKXd2sF/qxog6wGD PjOeO/qwGtfYsLecvMQ46NOPEKLiXHOys3JMoTfYQwvJvMHpewbcmAjJZdzpFGo+AedOwv KvaGx6ha/4nh2JV6VEabMfzuc4iZFuAWN3rdQdzYqyI1dw8Fk630ijhJKoEvDFTpPbLphe 3IwA68AwJGuTovs7Ueeq2+NWC2f42p1EQ1GC5pRpKwyjG2srRj4MrPACtMVYcBuYDSRClo Ag82qe/zfoX1j5d+vwlvxXDMJiEgprMEwUfb/ormXdbkZsJjiR5DsN7evJpBEg== 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=8f02234dbd1d578740b08afb4a0d6b877432adc9 commit 8f02234dbd1d578740b08afb4a0d6b877432adc9 Author: Ed Maste AuthorDate: 2021-10-29 00:49:12 +0000 Commit: Ed Maste CommitDate: 2021-11-29 15:10:53 +0000 Don't build sanitizer runtimes under WITHOUT_CXX In the past we built the sanitizer runtimes when building Clang (and using Clang as the compiler) but 7676b388adbc changed this to be conditional only on using Clang, to make the runtimes available for external Clang. They fail to build when WITHOUT_CXX is set though, so add MK_CXX as part of the condition. Reported by: Michael Dexter, Build Option Survey Reviewed by: imp, jrtc27 Fixes: 7676b388adbc ("Always build the sanitizer runtimes...") Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32731 (cherry picked from commit ad09e2c8cfbc2cf6f2b8826c121d6de8b3bfe96d) --- lib/Makefile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 3c218415d9ca..f42909ec0b09 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -172,10 +172,9 @@ SUBDIR.${MK_KERBEROS_SUPPORT}+= libcom_err SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats -# The libraries under libclang_rt can only be built by clang, and only make -# sense to build when clang is enabled at all. Furthermore, they can only be -# built for certain architectures. -.if ${COMPILER_TYPE} == "clang" && \ +# The libraries under libclang_rt can only be built by clang and when we enable +# C++ support. Furthermore, they can only be built for certain architectures. +.if ${COMPILER_TYPE} == "clang" && ${MK_CXX} != "no" && \ (${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "powerpc")