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

Make -nodefaultlib override -de{fault,bug}lib=foo instead of vice versa.

Browse Source
This commit is contained in:
Matti Niemenmaa
2010-03-05 21:40:51 +02:00
parent 05c466fc4a
commit b0271794cd
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gen/main.cpp
View File

@@ -301,29 +301,32 @@ int main(int argc, char** argv)
else
libs = global.params.defaultlibnames;
if (libs)
if (!noDefaultLib)
{
for (int i = 0; i < libs->dim; i++)
if (libs)
{
char* lib = (char *)libs->data[i];
char *arg = (char *)mem.malloc(strlen(lib) + 3);
strcpy(arg, "-l");
strcpy(arg+2, lib);
global.params.linkswitches->push(arg);
for (int i = 0; i < libs->dim; i++)
{
char* lib = (char *)libs->data[i];
char *arg = (char *)mem.malloc(strlen(lib) + 3);
strcpy(arg, "-l");
strcpy(arg+2, lib);
global.params.linkswitches->push(arg);
}
}
}
else if (!noDefaultLib)
{
else
{
#if DMDV2
global.params.linkswitches->push(mem.strdup("-ldruntime-ldc"));
global.params.linkswitches->push(mem.strdup("-ldruntime-ldc"));
#else
global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
global.params.linkswitches->push(mem.strdup("-ltango-cc-tango"));
global.params.linkswitches->push(mem.strdup("-ltango-gc-basic"));
// pass the runtime again to resolve issues
// with linking order
global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
global.params.linkswitches->push(mem.strdup("-ltango-cc-tango"));
global.params.linkswitches->push(mem.strdup("-ltango-gc-basic"));
// pass the runtime again to resolve issues
// with linking order
global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
#endif
}
}
if (global.params.run)