diff dmd/link.c @ 133:44a95ac7368a trunk

[svn r137] Many fixes towards tango.io.Console working, but not quite there yet... In particular, assertions has been fixed to include file/line info, and much more!
author lindquist
date Mon, 14 Jan 2008 05:11:54 +0100
parents 1700239cab2e
children 5acec6b2eef8
line wrap: on
line diff
--- a/dmd/link.c	Fri Jan 11 17:57:40 2008 +0100
+++ b/dmd/link.c	Mon Jan 14 05:11:54 2008 +0100
@@ -283,14 +283,18 @@
      * passed with -l.
      */
 
-    //argv.push((void *)"-lphobos");    // turns into /usr/lib/libphobos.a
-    argv.push((void *)"-lpthread");
-    argv.push((void *)"-lm");
+    argv.push((void*)"-ltango-base-c-llvmdc");
+    argv.push((void*)"-lpthread");
+    argv.push((void*)"-ldl");
+    argv.push((void*)"-lm");
 
-    std::string corelibpath = global.params.runtimeImppath;
-    corelibpath.append("/libtango-base-llvmdc.a");
     argv.append(global.params.objfiles);
-    argv.push((void *)corelibpath.c_str());
+
+    std::string runtime_path(global.params.runtimePath);
+    if (*runtime_path.rbegin() != '/')
+        runtime_path.append("/");
+    runtime_path.append("libtango-base-llvmdc.a");
+    argv.push((void*)runtime_path.c_str());
 
     if (!global.params.quiet)
     {