diff options
| author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-12-30 16:46:12 +0000 |
|---|---|---|
| committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-12-30 16:46:12 +0000 |
| commit | 8db835a6f76cccc41fdf534ee358dd59ab73fefe (patch) | |
| tree | 141418c2ba1d4bc452c490cf4f94c7b3c1c6b62f | |
| parent | 0dc6ab13366dae47f4b4ab1670d6b4b3859624c2 (diff) | |
| download | flang-8db835a6f76cccc41fdf534ee358dd59ab73fefe.tar.gz | |
Revert source management API change for google stable branch.
| -rw-r--r-- | lib/CodeGen/CodeGenAction.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/CodeGen/CodeGenAction.cpp b/lib/CodeGen/CodeGenAction.cpp index 4398b6c7e4..53ee5aafd3 100644 --- a/lib/CodeGen/CodeGenAction.cpp +++ b/lib/CodeGen/CodeGenAction.cpp @@ -120,7 +120,8 @@ namespace flang { // Link LinkModule into this module if present, preserving its validity. if (LinkModule) { std::string ErrorMsg; - if (Linker::LinkModules(M, LinkModule.get())) { + if (Linker::LinkModules(M, LinkModule.get(), Linker::PreserveSource, + &ErrorMsg)) { Diags.Report(diag::err_fe_cannot_link_module) << LinkModule->getModuleIdentifier() << ErrorMsg; return; |