From nobody Thu Jul 31 10:02:16 2025 X-Original-To: dev-commits-src-all@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 4bt4Ph3vsbz63hW5; Thu, 31 Jul 2025 10:02:16 +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 4bt4Ph1VTxz3wGg; Thu, 31 Jul 2025 10:02:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753956136; 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=Gc46FGAl9s7E9AzcWIiYTJU+Nkz9E/mXkDJVCkcEEfM=; b=Rr7jUQvqOk6zlK8F5Gard6X6wLMS3mx5bRu9DbcktQLzjNlg0ltV09IRMUaF3oLufA7xw8 t1svBlT2PgdRK3jo+jry9x8AVvD6XUzASL2KSiTFCrBD+OKhFLfLxr5IA9ksCIHI4kvj0O N0XQ47DF2Lz5dpmx7LxqmEKAlgStfJNLxZETG+rgfm89FZqxUkgEgcdPQhTdPEF5mqjXRz yGkcDW3hii7VdftQ+1sesUaeiiSMFA/jNuQ+taZvQr6x3S9Pf9uzsA7M3PQA2PWbfAaZkH pSDvopT4ANP2hp1hv2oJn909/FrHXF8Ms9UrbYURI25j9MGVhMLWwXhBF9dylA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753956136; 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=Gc46FGAl9s7E9AzcWIiYTJU+Nkz9E/mXkDJVCkcEEfM=; b=nPVUD7s52yYGM3j+APc6pRAOV3tPYQ2v2L4rnssolewJQI9qn4mCuTpwGuwYCS8iHWqAoF ZL/ZYZXgIe94+qgtAYMfMb92MyaFT/JGRS1Mb//zEYrwyN0kjH2YG/v5ULTApSKDCj8eDj qVOvrT5tAcAPV3Hj1kaT0yjn8gtTlfZfVjJKqU8WGhDF3gq0uANgfQ3dwgJbvQzRs0UYfT 76RSlrD+4TLisf6gUyjYEGcaJic5irLWQPtrW0fNj6TjBhZg6N4PHRUhJ/LZw4syV6Qetb HPDs8cod9QmpAOAcgWBW94qnDJbpMfyizHJOuytxMMdLLFDKe8cjpUiVVZVSjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753956136; a=rsa-sha256; cv=none; b=A4WE2Zu0opCi4ivZ7pZBsxDFTi6w+lVr1n1esZTH5BrXDdzevJX5KxdsQnGT2a8L5OBqSJ yFciYvFxw3xX+g/0LtCqJa2H3HpiFQFfV/efkBDsshVm1Z9c+UGocktpdcWB52l0aflKUL jwUbzx8uuXAQ2xztlxMgrq1MUWD2oz7IBf5o7uiZMKeTkYW+MVMZkYMNQX5Bw1MMMjVAis J2e1yTvxetL3XWudno+nQweJ6A2+yKGKX1HE29k4epk3RJraEic4Xe2MPOSl+UBXdVI7ab OUr4xVonYSIwX0FsGLdnW5c1EthIVvuKxbz0lfOI8GDaMlA4UTtO3Ewme3smrA== 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 4bt4Ph136KzxVm; Thu, 31 Jul 2025 10:02:16 +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 56VA2GVu063679; Thu, 31 Jul 2025 10:02:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56VA2G7E063676; Thu, 31 Jul 2025 10:02:16 GMT (envelope-from git) Date: Thu, 31 Jul 2025 10:02:16 GMT Message-Id: <202507311002.56VA2G7E063676@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: de19b9d6e967 - stable/13 - clang-scan-deps: Pass ${TDFILE} to tblgen, not ${.ALLSRC} List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: de19b9d6e967a91565605b04c9f4b61b2099f096 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=de19b9d6e967a91565605b04c9f4b61b2099f096 commit de19b9d6e967a91565605b04c9f4b61b2099f096 Author: Lexi Winter AuthorDate: 2025-07-27 10:53:19 +0000 Commit: Lexi Winter CommitDate: 2025-07-31 09:57:54 +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/}