summaryrefslogtreecommitdiffstats
path: root/clang/lib/Frontend/CompilerInstance.cpp
diff options
context:
space:
mode:
authorJustin Bogner <mail@justinbogner.com>2015-08-09 05:40:38 +0000
committerJustin Bogner <mail@justinbogner.com>2015-08-09 05:40:38 +0000
commitb102d1a432d2ed01cf1901e5265fbd15ceed40d9 (patch)
treef687fc319245d86458f373b041555c9f2159bbe0 /clang/lib/Frontend/CompilerInstance.cpp
parent2a6edb30d9de28dea35dc3dcbce31f1c4ad394b9 (diff)
downloadbcm5719-llvm-b102d1a432d2ed01cf1901e5265fbd15ceed40d9.tar.gz
bcm5719-llvm-b102d1a432d2ed01cf1901e5265fbd15ceed40d9.zip
Revert "[modules] Don't leak -M flags for dependency file generation into the module"
This was failing tests on a bunch of bots: http://lab.llvm.org:8011/builders/clang-hexagon-elf/builds/29919/steps/check-all http://lab.llvm.org:8011/builders/clang-x86_64-debian-fast/builds/29627/steps/check-all http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_check/9959/ http://lab.llvm.org:8080/green/job/clang-stage2-configure-Rlto_check/5591/ This reverts r244412 llvm-svn: 244414
Diffstat (limited to 'clang/lib/Frontend/CompilerInstance.cpp')
-rw-r--r--clang/lib/Frontend/CompilerInstance.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/clang/lib/Frontend/CompilerInstance.cpp b/clang/lib/Frontend/CompilerInstance.cpp
index 5133ffc2726..4e7b08ac79b 100644
--- a/clang/lib/Frontend/CompilerInstance.cpp
+++ b/clang/lib/Frontend/CompilerInstance.cpp
@@ -944,10 +944,8 @@ static bool compileModuleImpl(CompilerInstance &ImportingInstance,
FullSourceLoc(ImportLoc, ImportingInstance.getSourceManager()));
// If we're collecting module dependencies, we need to share a collector
- // between all of the module CompilerInstances. Other than that, we don't
- // want to produce any dependency output from the module build.
+ // between all of the module CompilerInstances.
Instance.setModuleDepCollector(ImportingInstance.getModuleDepCollector());
- Invocation->getDependencyOutputOpts() = DependencyOutputOptions();
// Get or create the module map that we'll use to build this module.
std::string InferredModuleMapContent;
OpenPOWER on IntegriCloud