Skip to content

Commit e92595a

Browse files
committed
Merge commit 'f8ba0df8781a' from llvm.org/main into next
Conflicts: clang/lib/Tooling/DependencyScanning/DependencyScanningService.cpp
2 parents e78226b + f8ba0df commit e92595a

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

clang/lib/Tooling/DependencyScanning/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
set(LLVM_LINK_COMPONENTS
2-
${LLVM_TARGETS_TO_BUILD}
32
Core
43
Option
54
Support

clang/lib/Tooling/DependencyScanning/DependencyScanningService.cpp

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "llvm/CAS/ActionCache.h"
1212
#include "llvm/CAS/CachingOnDiskFileSystem.h"
1313
#include "llvm/CAS/ObjectStore.h"
14-
#include "llvm/Support/TargetSelect.h"
1514

1615
using namespace clang;
1716
using namespace tooling;
@@ -35,10 +34,4 @@ DependencyScanningService::DependencyScanningService(
3534
// we're not doing unneeded work.
3635
if (Format == ScanningOutputFormat::FullIncludeTree)
3736
this->OptimizeArgs &= ~ScanningOptimizations::FullIncludeTreeIrrelevant;
38-
39-
// Initialize targets for object file support.
40-
llvm::InitializeAllTargets();
41-
llvm::InitializeAllTargetMCs();
42-
llvm::InitializeAllAsmPrinters();
43-
llvm::InitializeAllAsmParsers();
4437
}

0 commit comments

Comments
 (0)