From nobody Mon Jul 28 12:46:21 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 4brJBQ34l5z632XQ; Mon, 28 Jul 2025 12:46:22 +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 4brJBQ125Lz3mfc; Mon, 28 Jul 2025 12:46:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753706782; 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=mXUaeYJvZG2tC+ZzsEfzWofXdpyOd+sPq6WVUkTfWnc=; b=j4UGByFAm60nssEjwqCGtSYH4hqIaJlnYIBRPbgoaoRgKoKJ+PNyRR7ZGNuijmT/hrjcHB UswlhAID26LNtrMIzmH8shB2EgvcorS2WhEmWjbKKBp2h9vCBXNT9SAVF+TvLoNTXTNlm/ d3gdX77nb0sefP5HKRipoUe9p5HRZVo4RiwBB56Tex8WD9APtSTJMoNbsLzyqv8iJ2hnL8 49mAAjdFn8uIqlPu6TCYW7+FumEA5fZ42bx4j/YDYxj6Ns5cGZuK8XjsCcFamD19dqoQAV tsH7fd0pVUhLWRYm07UwsrKsz5SWeYYZgp2I62aXY+E0v1rDaeXHIr64t8BRoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753706782; 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=mXUaeYJvZG2tC+ZzsEfzWofXdpyOd+sPq6WVUkTfWnc=; b=g5JRynwhKowOkMauk2uS95gYb2tlnia8fpLgy2rP9rSIZwxwRJv24cypWcBXmxNPHvVGgx sNtB7Rl5Y1E9/o11fRZQNmcyjNKgIcQ59ujWOYZliPj2VVJhOhh+6bzMeNfJysGAgxrKeV 9fSG2YqMtppAG8rnhelMpJaX+lyc7aULPgWhAy67BEOIUdrmHBYCVd2D2mFA1amgojJb1v pzUr5v6Xuu8mhnugAIQCCCHBwh7gDHRU+sKUVPTKhPai/nuez1p2JQY3xAasCGNYLe7ArM o3SNBF23GwQIMWE0i+sKLBCxqISduCkp+2+HhW3imZCOmVqoZeYK9MT+ok8UAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753706782; a=rsa-sha256; cv=none; b=F8Yc/9GRGZS/lBbRTLM8Z5nElsTkS8YTTk+jtYIHFa6RaKo2Tt7EYS4XK9pAi4X6m3E3r2 d7py8f+TIXqJJP5YGcNqnrnS4PEbNKyAJXs4Dv/eXCf9w4oMtxqWMOAS75JySNKYXMRT3t IRACdHXlJv9ACdw46zE25CeESP/8uLwQoE43x3sHFmM5/umVNkPqUQRq1QiYba0U/rWV7t oHEXk+jE5HCEFqCGcGKjtPNAO4Oq3dnrmfjhP0VEmWOK4N/yEuYo6XB6FCsyK28PwKxBVj 4QK+9l9DPbr+GD7nnj1CbKlwwFnKNMABiXjuK5rfjmADRYVWzSLkC2Ccw08Bag== 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 4brJBQ085vzmbS; Mon, 28 Jul 2025 12:46:22 +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 56SCkLuq093222; Mon, 28 Jul 2025 12:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SCkLvf093219; Mon, 28 Jul 2025 12:46:21 GMT (envelope-from git) Date: Mon, 28 Jul 2025 12:46:21 GMT Message-Id: <202507281246.56SCkLvf093219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Lexi Winter Subject: git: ad023bc26e10 - main - clang-scan-deps: Pass ${TDFILE} to tblgen, not ${.ALLSRC} 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad023bc26e106e28e1b4845f991b52b533bd0802 Auto-Submitted: auto-generated The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=ad023bc26e106e28e1b4845f991b52b533bd0802 commit ad023bc26e106e28e1b4845f991b52b533bd0802 Author: Lexi Winter AuthorDate: 2025-07-27 10:53:19 +0000 Commit: Lexi Winter CommitDate: 2025-07-28 09:17:36 +0000 clang-scan-deps: Pass ${TDFILE} to tblgen, not ${.ALLSRC} ${.ALLSRC} can include the dependency OptParser.td, which causes llvm-tblgen to fail since it only accepts a single input argument. Use ${TDFILE} directly instead, which matches the other invocations of tblgen in the LLVM Makefiles. Fixes: d3c06bed2c16 ("clang: install clang-scan-deps") MFC after: 3 days Reviewed by: dim Differential Revision: https://reviews.freebsd.org/D51569 --- usr.bin/clang/clang-scan-deps/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.bin/clang/clang-scan-deps/Makefile b/usr.bin/clang/clang-scan-deps/Makefile index 16fecdb88867..8da12faccc45 100644 --- a/usr.bin/clang/clang-scan-deps/Makefile +++ b/usr.bin/clang/clang-scan-deps/Makefile @@ -10,13 +10,14 @@ SRCS+= ClangScanDeps.cpp \ .include "${SRCTOP}/lib/clang/clang.pre.mk" CFLAGS+= -I${.OBJDIR} -TDFILE= Opts.td -INCFILE= ${TDFILE:.td=.inc} + +INCFILE= Opts.inc +TDFILE= ${LLVM_BASE}/${SRCDIR}/Opts.td GENOPT= -gen-opt-parser-defs ${INCFILE}: ${TDFILE} ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ - -o ${.TARGET} ${.ALLSRC} + -o ${.TARGET} ${TDFILE} TGHDRS+= ${INCFILE} DEPENDFILES+= ${TGHDRS:C/$/.d/}