From 2e63bc5d8293d38cb3be7cb07d6267c9db385062 Mon Sep 17 00:00:00 2001
From: Tycho Sci <tychosci@gmail.com>
Date: Mon, 20 Feb 2012 14:49:22 +0900
Subject: [PATCH] cargo: Use $sysroot/$libdir/cargo as work dir

On win32  environment, it's "$sysroot/bin/cargo".
On unix-y environment, it's "$sysroot/lib/cargo".
---
 src/comp/util/filesearch.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/comp/util/filesearch.rs b/src/comp/util/filesearch.rs
index 82859ce22f1e..d5919ea3e5a4 100644
--- a/src/comp/util/filesearch.rs
+++ b/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> {