From nobody Thu Apr 25 15:44:12 2024 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 4VQKsT13QQz5Hyyp; Thu, 25 Apr 2024 15:44:13 +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 4VQKsT0b3Mz4Fds; Thu, 25 Apr 2024 15:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714059853; 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=ZzPoe0aRUv4RH06DIp1U8IM65hMQTUpGY6sY+oM4VII=; b=cUZrKYBKJSWY4tsL7lncXB412dR4T8nvbz1wWUOirgE5zriXIGNe/rUZndEilZ8au3VbY9 FRatgkHKTY6daUPG25hLTaAaCpUwmu3/IG8//Dc8UvUEW+s34fY1GJWDf7ZZrAtiyehS6j gcSE9isXg58AjgQAFE72EOR2QQ57fVVgb8gEqBcAUsNVIPz6DFYuty133g95YYAWMUDZmt J9f2/1cNO0vB3J+MdNzkg33zcSRe1erm9a7xfdRBvDkznLd5ADAjbN2mVgpOV+dEgUpplW jbTNfSbE7qsonfVwrYdLs+6vGp2G91PAA8hdSs8nS8mPllBvm3CLtiFcQ9cfnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714059853; a=rsa-sha256; cv=none; b=bh5ujLbQB8SpTnMy8V5h8u5sa2Gr+Oq9EGCOqLYy6stVlTs0CWLZWucIb4IWaIbPhKC9Be UflDysoMW4fx8JSAcRpy91cbz5MVxBPm51LmVxETiMWee4bD4vYcP74EHAyLkCHshlYSfc +bhUD5kV4mE4wFzAiduKKQ3w5NdlE7FVAntIL8iyi4NJVZDJ/IBFpYtjFEhBzqGfv50dq0 1HUjE47/g/op2kIU5YzNmDaBPmVUg/sMizBjOQQU5SnqHfq7A9AT+k1jhcBHE4MmyuIEfE 2OxAh/pZ+Bgph4yUhtRrjNWk+AO1xNWgNk5kqr+R6Hwg7hoMJJ2iNnZ6bTtR8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714059853; 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=ZzPoe0aRUv4RH06DIp1U8IM65hMQTUpGY6sY+oM4VII=; b=jJGc/t4CphybmIerF2NzICQFu0BB/w2NPqKS8P8VDi6eyt1bTuDgthK8lhoLFSvty+jmRV VV1wQQWrgCsWYCdzkylljOC5SYJ/RvJal0zfe8FY0Ch/oXkP6Wdcs2NO7sxH7nWJNBXXl1 JtSO9OOLXAYVPbE9FbSmCxtRbjatG9ISkJ+t+qRUY1Cbl1krPY0m71KCfSuvDR5FznQbju 22Bk40018eM14kGrIFWdriJqSXjuAjjvwxxk1MqlstNjMScfNzxOOnYSxfSjeLq5m+zCha IDpvA+Uyf8PLnm8GiC69okNFPAEgGdga3ft3v25EeCm+VrDy3GiI20EC8PBh9A== 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 4VQKsT0Bchz155P; Thu, 25 Apr 2024 15:44:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43PFiCxV044920; Thu, 25 Apr 2024 15:44:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43PFiCRX044917; Thu, 25 Apr 2024 15:44:12 GMT (envelope-from git) Date: Thu, 25 Apr 2024 15:44:12 GMT Message-Id: <202404251544.43PFiCRX044917@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: 514773a5486d - main - Skip building libclang_rt when WITHOUT_CLANG is used 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 514773a5486d1fa4f2d5acb5af1766965c20765b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=514773a5486d1fa4f2d5acb5af1766965c20765b commit 514773a5486d1fa4f2d5acb5af1766965c20765b Author: Dimitry Andric AuthorDate: 2024-04-25 15:05:29 +0000 Commit: Dimitry Andric CommitDate: 2024-04-25 15:05:29 +0000 Skip building libclang_rt when WITHOUT_CLANG is used As noted in bug 277096, when building a pkgbase repository using WITHOUT_CROSS_COMPILER and WITHOUT_TOOLCHAIN (which sets WITHOUT_CLANG), the following residual files are left over: /usr/lib/clang/18/lib/freebsd/libclang_rt.asan-x86_64.so /usr/lib/clang/18/share/asan_ignore_list.txt /usr/lib/clang/18/share/cfi_ignore_list.txt /usr/lib/clang/18/share/msan_ignore_list.txt This is because the lib/libclang_rt directory is still descended into, even if WITHOUT_CLANG is used. Fix it by not descending into the libclang_rt directory in that case. PR: 277096 Reported by: Siva Mahadevan MFC after: 3 days --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index cd1476a62d35..6135cff10c15 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -182,7 +182,7 @@ SUBDIR.${MK_LDNS}+= libldns SUBDIR.${MK_STATS}+= libstats # The libraries under libclang_rt can only be built by clang. -.if ${COMPILER_TYPE} == "clang" +.if ${COMPILER_TYPE} == "clang" && ${MK_CLANG} != "no" _libclang_rt= libclang_rt .elif (${MK_ASAN} != "no" || ${MK_UBSAN} != "no") && make(all) .error Requested build with sanitizers but cannot build runtime libraries!