---

tychosci · tychosci · commit 86a06b6c0090 · 2012-02-20T17:55:35.000+09:00
yaml --- r: 14381 b: refs/heads/try c: 2e63bc5 h: refs/heads/master i: 14379: 663f44f v: v3
diff --git a/[refs] b/[refs]
@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 657ef8ef6057b09be9b89b1f542ce64d2ec534d6
+refs/heads/try: 2e63bc5d8293d38cb3be7cb07d6267c9db385062
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
diff --git a/branches/try/src/comp/util/filesearch.rs b/branches/try/src/comp/util/filesearch.rs
@@ -48,8 +48,6 @@ fn mk_filesearch(maybe_sysroot: option<fs::path>,
                   result::ok(p) { [p] }
                   result::err(p) { [] }
                 }
-                + [fs::connect(fs::connect(self.sysroot, ".cargo"),
-                               libdir())]
         }
         fn get_target_lib_path() -> fs::path {
             make_target_lib_path(self.sysroot, self.target_triple)
@@ -113,7 +111,9 @@ fn get_sysroot(maybe_sysroot: option<fs::path>) -> fs::path {
 }
 
 fn get_cargo_sysroot() -> result::t<fs::path, str> {
-    result::ok(fs::connect(get_default_sysroot(),  ".cargo"))
+    let path = [get_default_sysroot(), libdir(), "cargo"];
+    check vec::is_not_empty(path);
+    result::ok(fs::connect_many(path))
 }
 
 fn get_cargo_root() -> result::t<fs::path, str> {

Original file line number	Diff line number	Diff line change
`@@ -48,8 +48,6 @@ fn mk_filesearch(maybe_sysroot: option<fs::path>,`
`48`	`48`	`result::ok(p) { [p] }`
`49`	`49`	`result::err(p) { [] }`
`50`	`50`	`}`
`51`		`- + [fs::connect(fs::connect(self.sysroot, ".cargo"),`
`52`		`- libdir())]`
`53`	`51`	`}`
`54`	`52`	`fn get_target_lib_path() -> fs::path {`
`55`	`53`	`make_target_lib_path(self.sysroot, self.target_triple)`
`@@ -113,7 +111,9 @@ fn get_sysroot(maybe_sysroot: option<fs::path>) -> fs::path {`
`113`	`111`	`}`
`114`	`112`
`115`	`113`	`fn get_cargo_sysroot() -> result::t<fs::path, str> {`
`116`		`- result::ok(fs::connect(get_default_sysroot(), ".cargo"))`
	`114`	`+ let path = [get_default_sysroot(), libdir(), "cargo"];`
	`115`	`+ check vec::is_not_empty(path);`
	`116`	`+ result::ok(fs::connect_many(path))`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`fn get_cargo_root() -> result::t<fs::path, str> {`