Produce dyn libraries with proper names

Issue #744

Author: lht

src/comp/back/link.rs

@@ -502,17 +502,16 @@ fn mangle_internal_name_by_seq(ccx: @crate_ctxt, flav: str) -> str {
 // If the user wants an exe generated we need to invoke
 // gcc to link the object file with some libs
 fn link_binary(sess: session::session,
-               saved_out_filename: str) {
+               obj_filename: str,
+               out_filename: str) {
     // The default library location, we need this to find the runtime.
     // The location of crates will be determined as needed.
     let stage: str = "-L" + sess.filesearch().get_target_lib_path();
 
     let prog: str = "gcc";
     // The invocations of gcc share some flags across platforms
 
-    let gcc_args =
-        [stage, "-m32", "-o", saved_out_filename,
-         saved_out_filename + ".o"];
+    let gcc_args = [stage, "-m32", "-o", out_filename, obj_filename];
     let lib_cmd;
 
     let os = sess.get_targ_cfg().os;
@@ -569,7 +568,7 @@ fn link_binary(sess: session::session,
         // be rpathed
         if sess.get_targ_cfg().os == session::os_macos {
             gcc_args += ["-Wl,-install_name,@rpath/"
-                        + fs::basename(saved_out_filename)];
+                        + fs::basename(out_filename)];
         }
     } else {
         // FIXME: why do we hardcode -lm?
@@ -586,7 +585,7 @@ fn link_binary(sess: session::session,
         gcc_args += ["-lrt", "-ldl"];
     }
 
-    gcc_args += rpath::get_rpath_flags(sess, saved_out_filename);
+    gcc_args += rpath::get_rpath_flags(sess, out_filename);
 
     log #fmt("gcc link args: %s", str::connect(gcc_args, " "));
     // We run 'gcc' here
@@ -600,13 +599,13 @@ fn link_binary(sess: session::session,
     // Clean up on Darwin
 
     if sess.get_targ_cfg().os == session::os_macos {
-        run::run_program("dsymutil", [saved_out_filename]);
+        run::run_program("dsymutil", [out_filename]);
     }
 
 
     // Remove the temporary object file if we aren't saving temps
     if !sess.get_opts().save_temps {
-        run::run_program("rm", [saved_out_filename + ".o"]);
+        run::run_program("rm", [obj_filename]);
     }
 }
 

src/comp/driver/rustc.rs

@@ -484,6 +484,7 @@ fn main(args: [str]) {
         sopts.output_type != link::output_type_exe ||
             sopts.static && sopts.library;
 
+    let ofile = "";
     alt output_file {
       none. {
         // "-" as input file will cause the parser to read from stdin so we
@@ -494,37 +495,36 @@ fn main(args: [str]) {
                 str::split(ifile, '.' as u8)
             } else { ["default", "rs"] };
         vec::pop(parts);
-        saved_out_filename = str::connect(parts, ".");
+        let base_filename = str::connect(parts, ".");
         let suffix =
             alt sopts.output_type {
               link::output_type_none. { "none" }
               link::output_type_bitcode. { "bc" }
               link::output_type_assembly. { "s" }
-
-
-
-
               // Object and exe output both use the '.o' extension here
               link::output_type_object. | link::output_type_exe. {
                 "o"
               }
             };
-        let ofile = saved_out_filename + "." + suffix;
-        compile_input(sess, cfg, ifile, ofile);
+        ofile = base_filename + "." + suffix;
+
+        if sopts.library {
+            saved_out_filename = std::os::dylib_filename(base_filename);
+        } else {
+            saved_out_filename = base_filename;
+        }
       }
-      some(ofile) {
-        let ofile = ofile;
-        // FIXME: what about windows? This will create a foo.exe.o.
-        saved_out_filename = ofile;
-        let temp_filename =
-            if !stop_after_codegen { ofile + ".o" } else { ofile };
-        compile_input(sess, cfg, ifile, temp_filename);
+      some(out_file) {
+        saved_out_filename = out_file;
+        ofile =
+            if !stop_after_codegen { out_file + ".o" } else { out_file };
       }
     }
 
+    compile_input(sess, cfg, ifile, ofile);
     if stop_after_codegen { ret; }
 
-    link::link_binary(sess, saved_out_filename);
+    link::link_binary(sess, ofile, saved_out_filename);
 }
 
 #[cfg(test)]