mirrors/ldc
1
0
Fork 0
mirror of https://github.com/ldc-developers/ldc.git synced 2025-05-04 09:00:33 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into merge-2.065

Browse source 
Conflicts:
	dmd2/declaration.h
	dmd2/dsymbol.h
	dmd2/func.c
	gen/functions.cpp
	gen/toir.cpp
	runtime/druntime
This commit is contained in:
kai 2014-06-23 07:57:30 +02:00
commit b7615f6a28
7 changed files with 55 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

6
driver/main.cpp
View file

@ -797,6 +797,7 @@ static void dumpPredefinedVersions()
}
static Module *entrypoint = NULL;
static Module *rootHasMain = NULL;
/// Callback to generate a C main() function, invoked by the frontend.
void genCmain(Scope *sc)
@ -826,7 +827,7 @@ void genCmain(Scope *sc)
char v = global.params.verbose;
global.params.verbose = 0;
m->importedFrom = sc->module;
m->importedFrom = m;
m->importAll(NULL);
m->semantic();
m->semantic2();
@ -834,6 +835,7 @@ void genCmain(Scope *sc)
global.params.verbose = v;
entrypoint = m;
rootHasMain = sc->module;
}
int main(int argc, char **argv)
@ -1246,7 +1248,7 @@ int main(int argc, char **argv)
if (global.params.obj)
{
llvm::Module* lm = m->genLLVMModule(context);
if (entrypoint && entrypoint->importedFrom == m)
if (entrypoint && rootHasMain == m)
{
#if LDC_LLVM_VER >= 303
llvm::Linker linker(lm);