From 6c6dcfc4ce750bb7dc15d0a4ad631c66beed70d4 Mon Sep 17 00:00:00 2001 From: Jan Svoboda Date: Mon, 14 Jun 2021 12:12:23 +0200 Subject: [PATCH] [clang][deps] Move enabling system header deps from `clang-scan-deps` to `DependencyScanning` library This patch moves enabling system header deps from `clang-scan-deps` into the `DependencyScanning` library. This will make it easier to preserve semantics of the original TU command-line for modular dependencies (see D104036). Reviewed By: arphaman Differential Revision: https://reviews.llvm.org/D104033 --- clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp | 1 + clang/tools/clang-scan-deps/ClangScanDeps.cpp | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp index 0011a56..a2f9b1c 100644 --- a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp +++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp @@ -177,6 +177,7 @@ public: if (Opts->Targets.empty()) Opts->Targets = {deduceDepTarget(Compiler.getFrontendOpts().OutputFile, Compiler.getFrontendOpts().Inputs)}; + Opts->IncludeSystemHeaders = true; switch (Format) { case ScanningOutputFormat::Make: diff --git a/clang/tools/clang-scan-deps/ClangScanDeps.cpp b/clang/tools/clang-scan-deps/ClangScanDeps.cpp index 8a15750..49c4757 100644 --- a/clang/tools/clang-scan-deps/ClangScanDeps.cpp +++ b/clang/tools/clang-scan-deps/ClangScanDeps.cpp @@ -502,8 +502,6 @@ int main(int argc, const char **argv) { AdjustedArgs.push_back("/clang:-o"); AdjustedArgs.push_back("/clang:" + LastO); } - AdjustedArgs.push_back("-Xclang"); - AdjustedArgs.push_back("-sys-header-deps"); if (!HasResourceDir) { StringRef ResourceDir = -- 2.7.4