Revert "Merge pull request #1025 from elly/master"

lkuper · lkuper · commit 0d43e90172c3 · 2011-10-11T22:23:47.000-04:00
This reverts commit e12e76e, reversing changes made to f480203.
diff --git 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;
   }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ extern "C" bool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src) {`
`53`	`53`	`// function" error.`
`54`	`54`	`Module DM = reinterpret_cast<Module >(Dest);`
`55`	`55`	`Module SM = reinterpret_cast<Module >(Src);`
`56`		`- if (Linker::LinkModules(DM, SM, Linker::DestroySource, &err)) {`
	`56`	`+ if (Linker::LinkModules(DM, SM, &err)) {`
`57`	`57`	`LLVMRustError = err.c_str();`
`58`	`58`	`return false;`
`59`	`59`	`}`