---

yaml
---
r: 6715
b: refs/heads/master
c: 7694689
h: refs/heads/master
i:
  6713: b96c5a0
  6711: 4c6fafe
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a87d80f6e28f28b091f11bd55dd4c4a51b165a91
+refs/heads/master: 7694689044352a5dca9a7622f11fb0f3d601154e

trunk/src/cargo/cargo.rs

@@ -154,13 +154,12 @@ fn install_one_crate(c: cargo, _path: str, cf: str, _p: pkg) {
         name = str::slice(name, 0u, ri as uint);
     }
     log #fmt["Installing: %s", name];
-    let old = vec::map({|x| str::slice(x, 2u, str::byte_len(x))}, fs::list_dir("."));
-    run::run_program("rustc", [name + ".rc"]);
-    let new = vec::map({|x| str::slice(x, 2u, str::byte_len(x))}, fs::list_dir("."));
+    let old = fs::list_dir(".");
+    run::run_program("rustc", [cf]);
+    let new = fs::list_dir(".");
     let created = vec::filter::<str>({ |n| !vec::member::<str>(n, old) }, new);
     for ct: str in created {
-        if (os::exec_suffix() != "" && str::ends_with(ct, os::exec_suffix())) ||
-           (os::exec_suffix() == "" && !str::starts_with(ct, "lib")) {
+        if str::ends_with(ct, os::exec_suffix()) {
             log #fmt["  bin: %s", ct];
             // FIXME: need libstd fs::copy or something
             run::run_program("cp", [ct, c.bindir]);

trunk/src/comp/back/link.rs

@@ -588,9 +588,16 @@ fn link_binary(sess: session::session,
         let long_libname =
             std::os::dylib_filename(#fmt("%s-%s-%s",
                                          lm.name, lm.extras_hash, lm.vers));
+        log "link_meta.name: " + lm.name;
+        log "long_libname: " + long_libname;
+        log "out_filename: " + out_filename;
+        log "dirname(out_filename): " + fs::dirname(out_filename);
+
         fs::connect(fs::dirname(out_filename), long_libname)
     } else { out_filename };
 
+    log "output: " + output;
+
     // 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();

trunk/src/comp/driver/rustc.rs

@@ -561,7 +561,10 @@ fn build_output_filenames(ifile: str, ofile: option::t<str>,
         obj_filename = base_filename + "." + suffix;
 
         if sess.building_library() {
-            saved_out_filename = std::os::dylib_filename(base_filename);
+            let dirname = fs::dirname(base_filename);
+            let basename = fs::basename(base_filename);
+            let dylibname = std::os::dylib_filename(basename);
+            saved_out_filename = fs::connect(dirname, dylibname);
         } else {
             saved_out_filename = base_filename;
         }