diff options
| author | Lindsey Kuper <lkuper@mozilla.com> | 2011-10-11 22:23:47 -0400 |
|---|---|---|
| committer | Lindsey Kuper <lkuper@mozilla.com> | 2011-10-11 22:23:47 -0400 |
| commit | 0d43e90172c364a5f92a0f4447a5030274f18832 (patch) | |
| tree | 542c86480486954f695206be3b8445ec73f43866 /src/rustllvm/RustWrapper.cpp | |
| parent | 813c2eb3698ad94c1c672bf81b1010486fc62a08 (diff) | |
| download | rust-0d43e90172c364a5f92a0f4447a5030274f18832.tar.gz rust-0d43e90172c364a5f92a0f4447a5030274f18832.zip | |
Revert "Merge pull request #1025 from elly/master"
This reverts commit e12e76e9ba0785d556a6ea3ca71e4a467e2aeb4d, reversing changes made to f480203fdd4d8b498453c1f7cc0ad4f59d87c596.
Diffstat (limited to 'src/rustllvm/RustWrapper.cpp')
| -rw-r--r-- | src/rustllvm/RustWrapper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp index 3031ce6685a..624b5854b5f 100644 --- a/src/rustllvm/RustWrapper.cpp +++ b/src/rustllvm/RustWrapper.cpp @@ -53,7 +53,7 @@ extern "C" bool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src) { // function" error. Module *DM = reinterpret_cast<Module *>(Dest); Module *SM = reinterpret_cast<Module *>(Src); - if (Linker::LinkModules(DM, SM, Linker::DestroySource, &err)) { + if (Linker::LinkModules(DM, SM, &err)) { LLVMRustError = err.c_str(); return false; } |
