Merge pull request rust-lang#1025 from elly/master

lkuper · lkuper · commit e12e76e9ba07 · 2011-10-11T18:53:01.000-07:00
Update LinkModules invocation to use new prototype
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, &err)) {
+  if (Linker::LinkModules(DM, SM, Linker::DestroySource, &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, &err)) {`
	`56`	`+ if (Linker::LinkModules(DM, SM, Linker::DestroySource, &err)) {`
`57`	`57`	`LLVMRustError = err.c_str();`
`58`	`58`	`return false;`
`59`	`59`	`}`