From nobody Thu Jul 31 09:51:54 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 4bt49l4Pqmz63h2j; Thu, 31 Jul 2025 09:51:55 +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 4bt49l0D1Jz3v0C; Thu, 31 Jul 2025 09:51:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753955515; 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=bQ6FIhkYFrr+SPtSvn/eusjuITWlq2wozTsLvncnQ9A=; b=jGn44QLJv9kFpBUHWUX1uPOy9FW5wtgpOdoR4rnMNVfSMTSwfMVpHLAwrhkgj0kX8qw4pP ySZ89yt4D2b5+Qd5hXwbr3SYvbmFK4fSb+6xZhS7K4628LXmOcxnC92yU1KsRNu89u+xz2 0SohUv9QoL8/FIAW5fcsL6H7UFyAKope6UY+UaoEob8E/MWKF0O2VpilfXQ3988UbOzpFY lGdQMm9esJYDrLuFAOPwEDUlN7OHtarmuLsdZ5wIiQNo7S3c37aqjCZWtreuB3tD58U8NW kJQYrQ4CJuaV1Pwe51zksxWvCzSBN5jmTNv46DKg6CDKiqYXKSCKx5nY+Sp2zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753955515; 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=bQ6FIhkYFrr+SPtSvn/eusjuITWlq2wozTsLvncnQ9A=; b=IY8TTlneM4sQZogLVpLIFtcNjOVpAYJa6Q5VLFp6XDmr5PeOnhymRBZHtgSsUTNjFGUy4H gfsirVYbSAZQBGwWIeeeNAr2Y4CLl4Bf1KGnYcvcqbX8cfEczl7HfDHvoC2JeM0LhbwVpU f7bcFJbfoZPkZkIIXwuOsi3A/ElET1hR2+OASVYblIjDm1mcRZI+oqZkyomQAE1XcQlpgy 57969c1IAS8Hyh1KLdB8IS4CZXnxo/vIqrnC9l91VcXwmdoYcOj7cB5CkZhyuC4AZC5BoN 25hADCxC2VtK/Tus8YSm+D9C5492UWyB7mwZkuId5K4E7LMtDYSDIlNHFSmmyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753955515; a=rsa-sha256; cv=none; b=XzJki2AtXgW9ZLxssYyoJzv0J7prqWc0cGzK9fbfo2yd7MvzQaODEcIh0drVysq0n29AXu bSgqbiNo+EL7oqw6db6c2O2LKLL3GB35DVzEFJag0F5aSHgVOFPn3A3NUaKitwqXasg4TK dIOVnbbMNgk8rPi+8mk4UVZ8Bdyds/xStG+nqdby97lS36lz+XZLmmsRtYeWuyoufdnoH0 BkbIiy26DsfMD0wogSB4VQ/KjwnsPWnTePZKvI0RAg7c1LhfzsZGWYWwuAo8IVTwvqNS3p JBpuYcBeq/H5G2B80GdWX2RQvg5DqkmXgVoLeCmTmqFrHfryvhz3JFKz4VBvkA== 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 4bt49k6k4jzx9s; Thu, 31 Jul 2025 09:51:54 +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 56V9ps13040761; Thu, 31 Jul 2025 09:51:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56V9pscn040758; Thu, 31 Jul 2025 09:51:54 GMT (envelope-from git) Date: Thu, 31 Jul 2025 09:51:54 GMT Message-Id: <202507310951.56V9pscn040758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lexi Winter Subject: git: 30218eb7c4bc - stable/14 - clang-scan-deps: Pass ${TDFILE} to tblgen, not ${.ALLSRC} 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: ivy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 30218eb7c4bcc8d49dc09a3e3001c64588af2e05 Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=30218eb7c4bcc8d49dc09a3e3001c64588af2e05 commit 30218eb7c4bcc8d49dc09a3e3001c64588af2e05 Author: Lexi Winter AuthorDate: 2025-07-27 10:53:19 +0000 Commit: Lexi Winter CommitDate: 2025-07-31 09:11:01 +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 (cherry picked from commit ad023bc26e106e28e1b4845f991b52b533bd0802) --- 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/}