From nobody Wed Apr 23 19:38:18 2025 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 4ZjTt3020Pz5tn0d; Wed, 23 Apr 2025 19:38:19 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZjTt269cRz43m0; Wed, 23 Apr 2025 19:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745437098; 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=NZmDEuC64KRpNZ9T5IlAz9knOrkumQtQEGzus4zloeo=; b=Bq7gQRAd25FuohE3IHrx3AUDWXn0dYrJ2SX4LSbwBmx/xPK4Zb64f63Md1PrEA5PD4KYL4 kHxEGU81+JQZt7OVYuLWPL/4Kh2qNtsAHHSxxM10M8P+yvdm3TKhgIvlWNbPNGvoWs0CLx S6CaDzacS3hWlLtvshU5zHxU9etyyogzow4dylovPadlb5Xd+gri8BDFxND/OhI345fjlI sJlVj3eTXCgeiIJPKYtXAJYMTKkDInVxLUjzF2xGppve3zbR3F7FYcBX/4kJXXVY0XwC+A Pd3JTmQp1/oTwvDX+GH2SUGAgD39gg6bO1YzaCtwkBXORQhnNQM4tYVelJ/XyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745437098; a=rsa-sha256; cv=none; b=BdNJLMHHi5mtejF2pWaUxmlJByyh0CNk17R5Pa5iIJV5qvEB+zt0fv8+CHY3SNC3CJZP1X p2KG1LtfIQbQwr/mLkGTGFYsw/s74luONcRBfaagc8vGMBkWfHzz6G5527eJndxzwqYbH8 37dlRXoshTIabXfzW53D9/mFdhqPeU9GaVdFIK/fJrcMQw1gSHuiyxIDNv8grg9GYYqsek UdJI6oXUktFIyqx9GzKi8sbuF6c22C9FFNvSc8JHcNakmDgOw4YeK7QxDvt4uvGWK74Xbe 5ubD0H7QTQKhJy+IOHMabjI/xaAFtuEcrwTeJCfyeiMbjsx98y3PUxugh/JQZA== 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=1745437098; 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=NZmDEuC64KRpNZ9T5IlAz9knOrkumQtQEGzus4zloeo=; b=GWAAEovmjOeHT1c42z+QAloQdZVg6GbzhUEt1uad75YFi8dEnT5Gfj6CHyu22LnJgtippu GjbFi9tnATOg7BFwUSWb+Kh0FpFErq4uaSl4nMN4nBzb6r4WxYNc4T6JWOm9M4CkfRGkC+ pypF2EpO+n7DboPQTVHGdeIlLoymEY6HYbYlcRkgRiDedCwVWO6Cr7pUzLHdaejs9aI/Em POi1Bnv/8tP8oqf8PxlfphFFyWKdEV4s1FvN5bWUcvQ8NAujm3+Vqc3C3g4cVYmloAjZPr eETl9BBB5KxctTaHrJWOVgPVmdmM+3JzaFYPniJSV383bjLjxzA4YMENZF4guw== 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 4ZjTt25Ty8z2k8; Wed, 23 Apr 2025 19:38:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53NJcIPr039758; Wed, 23 Apr 2025 19:38:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NJcI8e039755; Wed, 23 Apr 2025 19:38:18 GMT (envelope-from git) Date: Wed, 23 Apr 2025 19:38:18 GMT Message-Id: <202504231938.53NJcI8e039755@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: 3f68c3e9c138 - stable/14 - Fix build with WITH_CLANG_BOOTSTRAP and WITHOUT_CLANG 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 3f68c3e9c138824024d5a588827381ed85d7230c Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=3f68c3e9c138824024d5a588827381ed85d7230c commit 3f68c3e9c138824024d5a588827381ed85d7230c Author: Dimitry Andric AuthorDate: 2025-04-18 10:55:36 +0000 Commit: Dimitry Andric CommitDate: 2025-04-23 19:36:00 +0000 Fix build with WITH_CLANG_BOOTSTRAP and WITHOUT_CLANG When WITH_CLANG_BOOTSTRAP and WITHOUT_CLANG are both set, the cross-tools stage does not build a cross clang binary. This is because the Makefile in usr.bin/clang checks for WITHOUT_CLANG, and skips building the binary. To fix this, ensure that WITH_CLANG is set for the cross-tools phase whenever WITH_CLANG_BOOTSTRAP is set. While here, skip using the Makefile in usr.bin/clang, and directly use the Makefile in usr.bin/clang/clang instead. PR: 286154 Reported by: avg Reviewed by: avg, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D49886 (cherry picked from commit ea231471d024e93279dc2196d6d5d87e199ad55b) --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 34b2cd658172..d218ee62e697 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -793,6 +793,7 @@ TMAKE= \ # TOOLS_PREFIX set in BMAKE XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + MK_CLANG=${MK_CLANG_BOOTSTRAP} \ MK_LLDB=no \ MK_LLVM_BINUTILS=no \ MK_TESTS=no @@ -2860,7 +2861,7 @@ _elftctools= lib/libelftc \ .endif .if ${MK_CLANG_BOOTSTRAP} != "no" -_clang= usr.bin/clang +_clang= usr.bin/clang/clang .endif .if ${MK_LLD_BOOTSTRAP} != "no" _lld= usr.bin/clang/lld