projects/ldc: gen/main.cpp comparison

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

author	Matti Niemenmaa <matti.niemenmaa+hg@iki.fi>
date	Fri, 05 Mar 2010 21:40:51 +0200
parents	def7a1d494fd
children	9176437d98be

comparison

equal deleted inserted replaced

-:9cc791423e20
+:601d3eea4a68
 llvm::NoFramePointerElim = true;
 }
 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];
+for (int i = 0; i < libs->dim; i++)
-char *arg = (char *)mem.malloc(strlen(lib) + 3);
+{
-strcpy(arg, "-l");
+char* lib = (char *)libs->data[i];
-strcpy(arg+2, lib);
+char *arg = (char *)mem.malloc(strlen(lib) + 3);
-global.params.linkswitches->push(arg);
+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"));
 #endif
+}
 }
 if (global.params.run)
 quiet = 1;

Mercurial > projects > ldc