From nobody Thu Jul 7 20:55:14 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 21C0D12D6EE9; Thu, 7 Jul 2022 20:55:15 +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 4Lf7w30PbJz49LN; Thu, 7 Jul 2022 20:55:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657227315; 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=E6/C3p7tSEdbg68lrhT0CuKEXUI3thJEx/ZEIwjlxmA=; b=nx99Z1uYovCr9vAwHgFn0koie3kGk1Cd4UgclmAiUQ32d74+iSKNbjgzLgeiLci6dwezZi HJQ8tJjcP4NKiI2yrpB6+unSBpiwmgwltasnFqci8bCMamh9/yBHC0EpJUaRC4aDYEziFr YboUbppe9kps4sD+PZgeOCA0MX4q972uvs+b+XaBdqLESq6+42RRLtrNt2+NC7brYSg2jg kPM/9qjFmTAiVtRHdXCHBQJVhMSRZQ/eD1RfYuHjp6IcnAgkkGUs3ZV4Uq/Cv8/yuAwXXC Q7lXzpMnT2d8GwNilvpDJsHz3/eNp+ymU1Z4Ehy1dJjec7KXxzznoFZ/m3I9bg== 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 4Lf7w26YB4zwxv; Thu, 7 Jul 2022 20:55:14 +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 267KtE9A055935; Thu, 7 Jul 2022 20:55:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 267KtEpV055934; Thu, 7 Jul 2022 20:55:14 GMT (envelope-from git) Date: Thu, 7 Jul 2022 20:55:14 GMT Message-Id: <202207072055.267KtEpV055934@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0b09867f6714 - main - Simplify conditional guards for libclang_rt. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0b09867f671465d0703cc374972c455af594538c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657227315; 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=E6/C3p7tSEdbg68lrhT0CuKEXUI3thJEx/ZEIwjlxmA=; b=vxu4PhkEPd9yVyxAyjdOEuzbNoQ67aHBqMi/kgBkTTZr9NpTuAnRbf0Tyzrl96pEaF9ULs UbszMpkc/dC8A/G3PxvHe21K3a6xg5cBLEXVUm++r+i6F16DkjbZlTErV4Xla18HiCfnBP TiVUKlHHmjvWhnZkv9KSC03tnKcJlwpGODiZ6Lvsy0mFqkP8a9I69AeIf+oLfasd/gXZld Dpq+oNGDjl65/S8J1Xw5xopo68g25a1p8OPkIDaBKCL00VRxcH1FuDdsyN+dhz9kH6TVev qTiZwmIuVU71C/xgcbCs1TfvdhPkMmBQkRNZuzBXQ91vNS73mpfbdaKY7sYvhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657227315; a=rsa-sha256; cv=none; b=yml8YbKbPMrl6wMJHUmyrUNQBaRKdPbjkAeRB4V6N//kMaAkltQ7gMIqZDC/BWWto6OHKY 5lZErhiB3Rh7OlRaqmKnmsss7F9MHvlMs+tRghCRK62+HH9h2MlDT3bXBSEZzfRaBOYnMv tqXo/pSTfb1KYkWLfLz6E7bXitYjeyIOPWB0AUJnewPMgq4x0+1q+T8z/h8cS8Upx+fab3 mG7alwN/8LN5OvaDYLNauyuhmpRD32WXKxjU1aHSjnCVwmhsGIl1jq9pFc0OVC4tfcCVgo TfVrmORqk7mU8HdtIMm2Y5GlMs5HHGPh1+1iZNDAVRlLTEv69Y9r9UI3N3gNoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0b09867f671465d0703cc374972c455af594538c commit 0b09867f671465d0703cc374972c455af594538c Author: John Baldwin AuthorDate: 2022-07-07 20:54:57 +0000 Commit: John Baldwin CommitDate: 2022-07-07 20:54:57 +0000 Simplify conditional guards for libclang_rt. All supported architectures can build libclang_rt now. Reviewed by: dim Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D35740 --- lib/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index 816374552f0a..482e4d603f4b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -180,11 +180,8 @@ SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats # 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" || ${MACHINE_CPUARCH} == "riscv") +# C++ support. +.if ${COMPILER_TYPE} == "clang" && ${MK_CXX} != "no" _libclang_rt= libclang_rt .elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all) .error Requested build with sanitizers but cannot build runtime libraries!