From nobody Wed Apr 23 19:38:34 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 4ZjTtM560Rz5tmyH; Wed, 23 Apr 2025 19:38:35 +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 4ZjTtM1D2sz43rD; Wed, 23 Apr 2025 19:38:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745437115; 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=vBzMyhParZ4ZubgCzQmC775M4jPkBfYS1sKu7t+RLT8=; b=CaiLEgUrEDPrFClMoKppwATaZgARG/z579lXfkm3EzK2scB937CEmDK1TMG2OtZaFNTU3k jk8xtNWIMngRev2YPRyHCR2Df/Iew55qCVEjoz97EK6sV4e2y9/KS5unV3UURABJAsUIpz KylEDOH16HbYTI/+WKs3eR8K5Yj3J9s6DuQswZ6wwLlclKn6Zk0cprRg1NzKamFZc20wve VWk7DXJ9DCwQ8PI3ejcg1LVhvJSUoc1VtVXZV9mDJlQQ/2W1hkz1FMZYOZs5cfQkBd2utA TykQrCYCVQrcbfzUWb9hMy6riRCg26n+dxQzO4qOAGsr3IqrqNHiiZGbXTZZBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745437115; a=rsa-sha256; cv=none; b=HuTnR5R005AeRrzKRUyfOQUtdsBI7fiJfNVf1FTm2g/0dWGGvxJlrWWStGxzzzodlJFgmV qD3nsxlS+iiyLe5+kMTHDOEaZHj3gb0YUJt/QOkP2xYPdkLyKD2DDWFU+J0ShlD40XBp+2 b6t6HwIafcqJyiaZcsVb/OInFp12Jg5J6LnUYogQySAE17M27OXIMYNyP6J63TiGZeY8CZ /Aeg3rYZ/vJOkKVjfBrcyJ7T+yz9FRhZCikNkka0ZWon4HqINs+9W/0ITa+A4oW1KhpRdB 6+JGBhC9e30kpG/ENc/kMoMiioRI0bKBJ/+fhK7m0/tbKsz4QxwZd4IhJSMd5A== 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=1745437115; 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=vBzMyhParZ4ZubgCzQmC775M4jPkBfYS1sKu7t+RLT8=; b=j8EuCB/woZuh6aYvXVOhEoR5VJMb0GjxPTwQiOxj84mVJICheqnTsHGNK9Zp3SCi9ia2uW mp53i+zR1ooK1OvDBRWasaeLZjzYTI9WTWApMVTmudf5uA4ufTixQgZxrKz4VGc81O5zON 7GKkIe46RfLCw4H89mTHurtznkOjJ2Vgm5fIg4a52h4/49SG1zr47fUq4283nRXnS4+hDU +vyOO4xp9+ZTiqk/4ZY62boHLmpKPOww8l43JBoC7YYlSzVbLxDzQXiwJq9WWLemaTajmY 4jcQQuoKC4UTTyyRnDBN3oriocAmwFEbkjFtmJCBrOJedJ+Gwzi8RjF8K2oYGg== 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 4ZjTtL6wdwz2rC; Wed, 23 Apr 2025 19:38:34 +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 53NJcYkq039952; Wed, 23 Apr 2025 19:38:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53NJcYeq039949; Wed, 23 Apr 2025 19:38:34 GMT (envelope-from git) Date: Wed, 23 Apr 2025 19:38:34 GMT Message-Id: <202504231938.53NJcYeq039949@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: 5195ff613fca - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 5195ff613fca40653d263bbada8a335ad864612e Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=5195ff613fca40653d263bbada8a335ad864612e commit 5195ff613fca40653d263bbada8a335ad864612e Author: Dimitry Andric AuthorDate: 2025-04-18 10:55:36 +0000 Commit: Dimitry Andric CommitDate: 2025-04-23 19:37:40 +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 d5c7eee442b0..3f965694f787 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -782,6 +782,7 @@ TMAKE= \ # TOOLS_PREFIX set in BMAKE XMAKE= ${BMAKE} \ TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + MK_CLANG=${MK_CLANG_BOOTSTRAP} \ MK_CLANG_IS_CC=${MK_CLANG_BOOTSTRAP} \ MK_LLDB=no \ MK_LLVM_BINUTILS=no \ @@ -2707,7 +2708,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