---

yaml
---
r: 6665
b: refs/heads/master
c: 76f13c9
h: refs/heads/master
i:
  6663: 8a951c8
v: v3

Author: lht

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c6f83f69312c681731f5fd28137de450b4d2881
+refs/heads/master: 76f13c95a0d1b1f33805719ccde9600b000e4418

trunk/src/comp/back/link.rs

@@ -561,6 +561,29 @@ fn link_binary(sess: session::session,
                obj_filename: str,
                out_filename: str,
                lm: link_meta) {
+    // Converts a library file name into a gcc -l argument
+    fn unlib(config: @session::config, filename: str) -> str {
+        let rmlib =
+            bind fn (config: @session::config, filename: str) -> str {
+                     if config.os == session::os_macos ||
+                            config.os == session::os_linux &&
+                                str::find(filename, "lib") == 0 {
+                         ret str::slice(filename, 3u,
+                                        str::byte_len(filename));
+                     } else { ret filename; }
+                 }(config, _);
+        fn rmext(filename: str) -> str {
+            let parts = str::split(filename, '.' as u8);
+            vec::pop(parts);
+            ret str::connect(parts, ".");
+        }
+        ret alt config.os {
+              session::os_macos. { rmext(rmlib(filename)) }
+              session::os_linux. { rmext(rmlib(filename)) }
+              _ { rmext(filename) }
+            };
+    }
+
     let output = if sess.building_library() {
         let long_libname =
             std::os::dylib_filename(#fmt("%s-%s-%s",
@@ -585,29 +608,6 @@ fn link_binary(sess: session::session,
         lib_cmd = "-dynamiclib";
     } else { lib_cmd = "-shared"; }
 
-    // Converts a library file name into a gcc -l argument
-    fn unlib(config: @session::config, filename: str) -> str {
-        let rmlib =
-            bind fn (config: @session::config, filename: str) -> str {
-                     if config.os == session::os_macos ||
-                            config.os == session::os_linux &&
-                                str::find(filename, "lib") == 0 {
-                         ret str::slice(filename, 3u,
-                                        str::byte_len(filename));
-                     } else { ret filename; }
-                 }(config, _);
-        fn rmext(filename: str) -> str {
-            let parts = str::split(filename, '.' as u8);
-            vec::pop(parts);
-            ret str::connect(parts, ".");
-        }
-        ret alt config.os {
-              session::os_macos. { rmext(rmlib(filename)) }
-              session::os_linux. { rmext(rmlib(filename)) }
-              _ { rmext(filename) }
-            };
-    }
-
     let cstore = sess.get_cstore();
     for cratepath: str in cstore::get_used_crate_files(cstore) {
         if str::ends_with(cratepath, ".rlib") {
@@ -655,7 +655,7 @@ fn link_binary(sess: session::session,
         gcc_args += ["-lmorestack"];
     }
 
-    gcc_args += rpath::get_rpath_flags(sess, out_filename);
+    gcc_args += rpath::get_rpath_flags(sess, output);
 
     log #fmt("gcc link args: %s", str::connect(gcc_args, " "));
     // We run 'gcc' here