diff options
| author | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-11-21 16:15:34 +0000 |
|---|---|---|
| committer | Mark Doffman <mark.doffman@codethink.co.uk> | 2014-11-21 16:15:34 +0000 |
| commit | d8c478c1147996984ade8e9b6d7c7f6d02d13afc (patch) | |
| tree | 83e98815da4ace717165464504cbe7e13c907fc1 | |
| parent | 5e1f661d0a5cc9d86ecccdd2224254571aaede21 (diff) | |
| download | flang-d8c478c1147996984ade8e9b6d7c7f6d02d13afc.tar.gz | |
Fix API Error in llvm update, compile with no RTTI.
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | lib/CodeGen/CodeGenAction.cpp | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e81f2aaa9..da37c83b5f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -216,6 +216,7 @@ macro(add_flang_library name) set(libkind) endif() add_library( ${name} ${libkind} ${srcs} ) + llvm_update_compile_flags(${name} ${srcs}) if( LLVM_COMMON_DEPENDS ) add_dependencies( ${name} ${LLVM_COMMON_DEPENDS} ) endif( LLVM_COMMON_DEPENDS ) diff --git a/lib/CodeGen/CodeGenAction.cpp b/lib/CodeGen/CodeGenAction.cpp index 53ee5aafd3..4398b6c7e4 100644 --- a/lib/CodeGen/CodeGenAction.cpp +++ b/lib/CodeGen/CodeGenAction.cpp @@ -120,8 +120,7 @@ namespace flang { // Link LinkModule into this module if present, preserving its validity. if (LinkModule) { std::string ErrorMsg; - if (Linker::LinkModules(M, LinkModule.get(), Linker::PreserveSource, - &ErrorMsg)) { + if (Linker::LinkModules(M, LinkModule.get())) { Diags.Report(diag::err_fe_cannot_link_module) << LinkModule->getModuleIdentifier() << ErrorMsg; return; |