From: Paul Woolcock <paul@woolcock.us>
Date: Mon, 5 Dec 2016 14:41:03 +0000 (-0500)
Subject: Using layout.root here should be sufficient
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~92^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e4090499dbcf5dbbf041e0f4b87ebf6d0c361006;p=cargo.git

Using layout.root here should be sufficient
---

diff --git a/src/cargo/util/toml.rs b/src/cargo/util/toml.rs
index 1d4f8608a..fd5a36ca1 100644
--- a/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@ -546,11 +546,7 @@ impl TomlManifest {
         }
 
         // processing the custom build script
-        let manifest_file = util::important_paths::find_root_manifest_for_wd(None, &layout.root)
-                                 .chain_error(|| human("Could not find root manifest location"))?;
-        let base_dir = manifest_file.parent()
-                                    .ok_or(human("Could not get parent directory of manifest"))?;
-        let new_build = self.maybe_custom_build(&project.build, &base_dir);
+        let new_build = self.maybe_custom_build(&project.build, &layout.root);
 
         // Get targets
         let targets = normalize(&lib,