D/ldc
1
0
Fork 0
mirror of https://github.com/xomboverlord/ldc.git synced 2026-02-14 19:03:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix LLVM 3.3 build error.

Browse Source 
llvm/Linker.h was changed. This commit reflects the new logic.
This commit is contained in:
kai
2013-05-05 18:42:14 +02:00
parent 2e7884a80d
commit ebaa3f08b3
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
driver/main.cpp
View File

@@ -1096,19 +1096,33 @@ int main(int argc, char** argv)
#else
char* moduleName = m->toChars();
#endif
llvm::Linker linker("ldc", moduleName, context);
std::string errormsg;
#if LDC_LLVM_VER >= 303
llvm::Linker linker(llvmModules[0]);
for (size_t i = 1; i < llvmModules.size(); i++)
{
if(linker.linkInModule(llvmModules[i], llvm::Linker::DestroySource, &errormsg))
error("%s", errormsg.c_str());
delete llvmModules[i];
}
#else
llvm::Linker linker("ldc", moduleName, context);
for (size_t i = 0; i < llvmModules.size(); i++)
{
if(linker.LinkInModule(llvmModules[i], &errormsg))
error("%s", errormsg.c_str());
delete llvmModules[i];
}
#endif
m->deleteObjFile();
writeModule(linker.getModule(), filename);
global.params.objfiles->push(const_cast<char*>(filename));
#if LDC_LLVM_VER >= 303
delete llvmModules[0];
#endif
}
// output json file