From nobody Fri Apr 18 18:32:46 2025 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 4ZfNfl0NdMz5tBG9; Fri, 18 Apr 2025 18:32:47 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfNfk3Bqnz3L7p; Fri, 18 Apr 2025 18:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745001166; 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=6cnytdUD6eqpN5Ikwm3ti/SbZynDJBlptRjcKo7UW4w=; b=p+ukzRUQjks4/OeMNU7UpRB6fQhNA0DAbd4f+ixzUD8rHQZ4iFMTAXLWXjWtvnGAMGAyXt IgXUFl3Qvel8pTrVj/qlwQk1Z77ajMF4wrtjQu7LB5m6/crRTOIw8/oSd4hqp8m2T756Lo aXdSmekLy/woiJ7nW92ZAN4AKRVHouzk/eFo7A/a7WM2OUqV7IFgWpalt3PqJaauP0YAjf GnYOwf53p+Xa3RuLysZuGCRqSbrbzVSyo5yXR7NElGPtuvtCzvRD0c7GBh9S5XUW/F1Itd Xemw8kKfKh1n/zljfiWOT5zbn21PVfA3v0H3jsK/b3ouLpBj5KMyiBzDiTYFpA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745001166; a=rsa-sha256; cv=none; b=l1N15/Rj+2IdX6J/41qmA0ZF/7scHJaqK3wB0T+mUUPdJ9JmKJwyUZVY1UENiHA9p5YV7u 6SbyAPzEwRvBXmrWTEBf9h87Sl66fR70595/aW7zKEijbpw3LTgca9+P5TkCtp3i3yzeiQ Eehi2QH8iA09Mhw5b0VUVEU2ALWtqfHq0NHVlfhD8MKnSnrw2LCP3uQSc6KyIJ6e9MlCcS 1OOlqdDof3qE8HPHoU7NKriitm9uUzHbXeUGLwFwp2Hkpj3dlIMq8baCdGFDVYDnm/N0jo LaYLAZmczG1feBbRGJ7Nkzg+juFpIlYs6zuwJLKxqsxgX/0BSVHiBFE1yaUJhA== 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=1745001166; 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=6cnytdUD6eqpN5Ikwm3ti/SbZynDJBlptRjcKo7UW4w=; b=HoRRoouDelqMBqCfOeBq+W3PkFGb7OYjz5P6RoDadRxz++Eagu8kys6vAi3Ggo92UPrdiR H/2O67PlgpTcN6jKyIGLaRfBEdhwx7kuj5xhdpbNf3FlkMgH7LeGucvAGYcIvgfPEhE/D/ sfHg9WLVyk671dcDJUYvmMnHlU+4NX9oxXCBvITVYyQHHR+t4F9yeencAeQH1dyR6CWsg/ igRmNqeropu9hzPhv1aGnGvamhJeOCt4DtoPm+quNi+jrIID+CFhisrLG+21RikFYltJJv uvGJp5ayRkOq3RaoNfBNrxIKQE17J0ENYkLnjMsFqULefSQcyGB6fMiq9kFLyQ== 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 4ZfNfk2kgFzm91; Fri, 18 Apr 2025 18:32:46 +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 53IIWkK6041073; Fri, 18 Apr 2025 18:32:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IIWkDI041070; Fri, 18 Apr 2025 18:32:46 GMT (envelope-from git) Date: Fri, 18 Apr 2025 18:32:46 GMT Message-Id: <202504181832.53IIWkDI041070@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: ea231471d024 - main - Fix build with WITH_CLANG_BOOTSTRAP and WITHOUT_CLANG 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: ea231471d024e93279dc2196d6d5d87e199ad55b Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=ea231471d024e93279dc2196d6d5d87e199ad55b commit ea231471d024e93279dc2196d6d5d87e199ad55b Author: Dimitry Andric AuthorDate: 2025-04-18 10:55:36 +0000 Commit: Dimitry Andric CommitDate: 2025-04-18 18:32:12 +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 --- Makefile.inc1 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index a18d10e80f17..4a0e4a884532 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -817,6 +817,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 @@ -2930,7 +2931,7 @@ _elftctools+= usr.bin/addr2line .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