diff options
| author | Lindsey Kuper <lindsey@rockstargirl.org> | 2011-10-11 18:53:01 -0700 |
|---|---|---|
| committer | Lindsey Kuper <lindsey@rockstargirl.org> | 2011-10-11 18:53:01 -0700 |
| commit | e12e76e9ba0785d556a6ea3ca71e4a467e2aeb4d (patch) | |
| tree | a8eb0cb752d6765efd7a4a5eb99118ba6c67fd81 | |
| parent | f480203fdd4d8b498453c1f7cc0ad4f59d87c596 (diff) | |
| parent | 19eae0bc3849e553aabf0f61cc2070236c2fffe7 (diff) | |
| download | rust-e12e76e9ba0785d556a6ea3ca71e4a467e2aeb4d.tar.gz rust-e12e76e9ba0785d556a6ea3ca71e4a467e2aeb4d.zip | |
Merge pull request #1025 from elly/master
Update LinkModules invocation to use new prototype
| -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 624b5854b5f..3031ce6685a 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, &err)) { + if (Linker::LinkModules(DM, SM, Linker::DestroySource, &err)) { LLVMRustError = err.c_str(); return false; } |