From nobody Sun Apr 28 08:04:47 2024 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 4VRzX00dlzz5JD7W; Sun, 28 Apr 2024 08:04:48 +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 4VRzWz6vsCz49C3; Sun, 28 Apr 2024 08:04:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714291488; 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=iNuR39TXRZAlGBe5ECSoKdYon5yA+5L+V3Z/cQPQOKQ=; b=cqQms0dgJz7iIlF7dbFbBX24tke7xEY9/wmmNGDlNhXqvvhhAm+W1i0xmXXpoBTMhWf3BT fZ3t2xjhrED0+b0T9hFf54Xoib1f6WIQNQ8P0HPxcuxHEetou8uo+2o0O6nKvUIEQe0/Tk kLfchwQlwV+/hydHg0dXFNnSt+FYol4gpp0RvPEHiZdvTOFvtVWvqlvaSUGfax3a2egQA0 frw1q6qcKdKmOlDdjGQyIoJnqWaiFspgt99YTag01x/LkA46wUSlH75U3NBQMHadEkUeHh MZzq/hKphW50k+Xr6qnkiLHtkJWtHYhTKL5H6Hb3V9nZOsKoli41of8D/lv38w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714291488; a=rsa-sha256; cv=none; b=YnmAQrH8Bl/hgc0nMtfjhO3EKbC6dSPQ6C0RGI3eGvdoapnrI9jEJ2CqQvrgAy+PMw3wXj gmGIHTDoo+fNafDTpjf4CTaYgSPCq6x2V3z+G+mDNxg1gLO5rJ0fphphpkQGEeIdDIBgLM E9nyri11jNuYYTzuWNMjAnhzZUIdYK+k5/qO9DbeJy/CYqoJ5xXyN9/wyAcGwre+aWT8hz puPTZq4MYVz6m1R6fZQJsPtmT/Ou1ZjzWMT0+mw6Q3Tjz0Fs/pEq1QDm4Ot8mzaAu4+tDI WbJj/BoX1btYIS6A4waRxlTCh5pMcQ0hJYPORrnB3xLu3dBySqinjeJlJdSQrA== 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=1714291488; 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=iNuR39TXRZAlGBe5ECSoKdYon5yA+5L+V3Z/cQPQOKQ=; b=CD21mIgZ+Us78sqcfx7goUZ8NcBmDWdOUpSELxeg3i8fFhOtc0GQ5fj5whk7VcVzi2e5t6 3io1LifIpaEulzbSbD5X36qWxlE2q3Nd3IufWRkTHJcuv3+5cup0hHifWDa8659ct+SwH6 0feaCYYLxiZC+AzwWgA/MmHPT2WOoLK363m8U3dWf12fYzVn1uSdIb1pauBLkf2E17rWQ0 7Pn5+Z9SiOs+lhimCInWbBkqXHlcQcKyBUpRfILdn66F3/uYnb6mzwzHifFMp/A3+Zicbu AUZrsrZpzc193mW/nE0EWiH8lrMRxC0o/VjTo1gkMJIS10phZ0WC+SS4eWdgeg== 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 4VRzWz6VwnzHKF; Sun, 28 Apr 2024 08:04:47 +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 43S84lUx075757; Sun, 28 Apr 2024 08:04:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43S84lk3075754; Sun, 28 Apr 2024 08:04:47 GMT (envelope-from git) Date: Sun, 28 Apr 2024 08:04:47 GMT Message-Id: <202404280804.43S84lk3075754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 9e6098a91168 - stable/14 - Skip building libclang_rt when WITHOUT_CLANG is used 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 9e6098a91168e4c90f6d38295f2876fe0e0fe190 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=9e6098a91168e4c90f6d38295f2876fe0e0fe190 commit 9e6098a91168e4c90f6d38295f2876fe0e0fe190 Author: Dimitry Andric AuthorDate: 2024-04-25 15:05:29 +0000 Commit: Dimitry Andric CommitDate: 2024-04-28 08:03:37 +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 (cherry picked from commit 514773a5486d1fa4f2d5acb5af1766965c20765b) --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index 6c0574e76afb..294e2b695bdc 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -179,7 +179,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!