From a3aef1aa95a3f2807b80af0336c4fe14dba06bb1 Mon Sep 17 00:00:00 2001
From: James Tucker <jftucker@gmail.com>
Date: Sun, 24 Sep 2017 21:32:27 -0700
Subject: 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
---
 src/ci/docker/dist-fuchsia/Dockerfile         | 22 +++++++++++++---------
 src/ci/docker/dist-fuchsia/build-toolchain.sh |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src/ci/docker')

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() {
-- 
cgit 1.4.1-3-g733a5