---

yaml
---
r: 5719
b: refs/heads/master
c: 5cd6dbd
h: refs/heads/master
i:
  5717: f3ada49
  5715: 21feca0
  5711: 9fb5a03
v: v3

Author: brson

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04e89af6dbf0e99c8cec6763a81b41dcf51e52c3
+refs/heads/master: 5cd6dbd5b9e53e374e6abf1ee433ca5b16360cf3

trunk/src/comp/back/rpath.rs

@@ -71,7 +71,7 @@ fn get_rpaths(os: session::os, cwd: fs::path, sysroot: fs::path,
     let abs_rpaths = get_absolute_rpaths(cwd, libs);
 
     // And a final backup rpath to the global library location.
-    let fallback_rpaths = [get_install_prefix_rpath(target_triple)];
+    let fallback_rpaths = [get_install_prefix_rpath(cwd, target_triple)];
 
     fn log_rpaths(desc: str, rpaths: [str]) {
         log #fmt("%s rpaths:", desc);
@@ -166,7 +166,7 @@ fn get_absolute(cwd: fs::path, lib: fs::path) -> fs::path {
     }
 }
 
-fn get_install_prefix_rpath(target_triple: str) -> str {
+fn get_install_prefix_rpath(cwd: fs::path, target_triple: str) -> str {
     let install_prefix = #env("CFG_PREFIX");
 
     if install_prefix == "" {
@@ -176,7 +176,7 @@ fn get_install_prefix_rpath(target_triple: str) -> str {
     let path = [install_prefix]
         + filesearch::relative_target_lib_path(target_triple);
     check vec::is_not_empty(path);
-    fs::connect_many(path)
+    get_absolute(cwd, fs::connect_many(path))
 }
 
 fn minimize_rpaths(rpaths: [str]) -> [str] {
@@ -219,8 +219,15 @@ mod test {
 
     #[test]
     fn test_prefix_rpath() {
-        let res = get_install_prefix_rpath("triple");
-        assert res == #env("CFG_PREFIX") + "/lib/rustc/triple/lib";
+        let res = get_install_prefix_rpath("/usr/lib", "triple");
+        assert str::ends_with(res, #env("CFG_PREFIX")
+                              + "/lib/rustc/triple/lib");
+    }
+
+    #[test]
+    fn test_prefix_rpath_abs() {
+        let res = get_install_prefix_rpath("/usr/lib", "triple");
+        assert str::starts_with(res, "/");
     }
 
     #[test]