diff options
| author | James Tucker <jftucker@gmail.com> | 2017-09-24 21:32:27 -0700 |
|---|---|---|
| committer | James Tucker <jftucker@gmail.com> | 2017-09-24 21:32:27 -0700 |
| commit | a3aef1aa95a3f2807b80af0336c4fe14dba06bb1 (patch) | |
| tree | 236584707b55721784a9023b3f10ad8a749910c8 /src/bootstrap | |
| parent | d7a17fb3cf3bedd5efdda46a8412cdce097d1154 (diff) | |
| download | rust-a3aef1aa95a3f2807b80af0336c4fe14dba06bb1.tar.gz rust-a3aef1aa95a3f2807b80af0336c4fe14dba06bb1.zip | |
Fix fuchsia toolchain prebuild setup
* Adjust bootstrap to provide useful output on failure * Add missing package dependencies in the build environment * Fix permission bits on prebuilt toolchain files
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/sanity.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs index 54208d8bb57..8b23be69a85 100644 --- a/src/bootstrap/sanity.rs +++ b/src/bootstrap/sanity.rs @@ -221,8 +221,9 @@ $ pacman -R cmake && pacman -S mingw-w64-x86_64-cmake let run = |cmd: &mut Command| { cmd.output().map(|output| { String::from_utf8_lossy(&output.stdout) - .lines().next().unwrap() - .to_string() + .lines().next().unwrap_or_else(|| { + panic!("{:?} failed {:?}", cmd, output) + }).to_string() }) }; build.lldb_version = run(Command::new("lldb").arg("--version")).ok(); |
