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 | |
| 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')
| -rw-r--r-- | src/bootstrap/sanity.rs | 5 | ||||
| -rw-r--r-- | src/ci/docker/dist-fuchsia/Dockerfile | 22 | ||||
| -rwxr-xr-x | src/ci/docker/dist-fuchsia/build-toolchain.sh | 2 |
3 files changed, 17 insertions, 12 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(); diff --git a/src/ci/docker/dist-fuchsia/Dockerfile b/src/ci/docker/dist-fuchsia/Dockerfile index 5e8222d4c36..bcd95924b42 100644 --- a/src/ci/docker/dist-fuchsia/Dockerfile +++ b/src/ci/docker/dist-fuchsia/Dockerfile @@ -1,17 +1,21 @@ FROM ubuntu:16.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - g++ \ - make \ - file \ - curl \ +RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y \ + build-essential \ + bzip2 \ ca-certificates \ - python2.7-dev \ - git \ cmake \ + curl \ + file \ + g++ \ + gdb \ + git \ + libedit-dev \ + make \ ninja-build \ + nodejs \ + python2.7-dev \ sudo \ - bzip2 \ xz-utils \ unzip @@ -34,4 +38,4 @@ ENV TARGETS=x86_64-unknown-fuchsia ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia ENV RUST_CONFIGURE_ARGS --target=$TARGETS --enable-extended -ENV SCRIPT python2.7 ../x.py dist --target $TARGETS +ENV SCRIPT python2.7 ../x.py dist --target $TARGETS \ No newline at end of file diff --git a/src/ci/docker/dist-fuchsia/build-toolchain.sh b/src/ci/docker/dist-fuchsia/build-toolchain.sh index 5900d548ecb..756013a235c 100755 --- a/src/ci/docker/dist-fuchsia/build-toolchain.sh +++ b/src/ci/docker/dist-fuchsia/build-toolchain.sh @@ -27,7 +27,7 @@ git reset --hard FETCH_HEAD # Download toolchain ./scripts/download-toolchain -chmod +x prebuilt/downloads/clang+llvm-x86_64-linux/bin/* +chmod -R a+rx prebuilt/downloads/clang+llvm-x86_64-linux cp -a prebuilt/downloads/clang+llvm-x86_64-linux/. /usr/local build() { |