about summary refs log tree commit diff
path: root/src/bootstrap/lib.rs
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2018-03-09 18:14:35 -0700
committerMark Simulacrum <mark.simulacrum@gmail.com>2018-04-03 11:39:15 -0600
commit84b5b340216dc1f086d5de2c7d234aa5883cdce8 (patch)
tree86f29ffa614306e68836b8dc23ed7dec270c7157 /src/bootstrap/lib.rs
parent637ac17c5292ce723430de0e87b92271989e1436 (diff)
downloadrust-84b5b340216dc1f086d5de2c7d234aa5883cdce8.tar.gz
rust-84b5b340216dc1f086d5de2c7d234aa5883cdce8.zip
Stop accessing current_dir in bootstrap
This ensures that the working directory of rustbuild has no effect on
it's run; since tests will run with a different cwd this is required for
consistent behavior.
Diffstat (limited to 'src/bootstrap/lib.rs')
-rw-r--r--src/bootstrap/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 833faf3618d..8b19bff3f6a 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -309,9 +309,8 @@ impl Build {
     ///
     /// By default all build output will be placed in the current directory.
     pub fn new(config: Config) -> Build {
-        let cwd = t!(env::current_dir());
         let src = config.src.clone();
-        let out = cwd.join("build");
+        let out = config.out.clone();
 
         let is_sudo = match env::var_os("SUDO_USER") {
             Some(sudo_user) => {