Merge dist-solaris with cross2 builder

.travis.yml

@@ -115,6 +115,8 @@ matrix:
       if: branch = auto
     - env: IMAGE=cross DEPLOY=1
       if: branch = auto
+    - env: IMAGE=cross2 DEPLOY=1
+      if: branch = auto
     - env: IMAGE=dist-aarch64-linux DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-android DEPLOY=1
@@ -125,8 +127,6 @@ matrix:
       if: branch = auto
     - env: IMAGE=dist-armv7-linux DEPLOY=1
       if: branch = auto
-    - env: IMAGE=dist-fuchsia DEPLOY=1
-      if: branch = auto
     - env: IMAGE=dist-i586-gnu-i686-musl DEPLOY=1
       if: branch = auto
     - env: IMAGE=dist-i686-freebsd DEPLOY=1

src/ci/docker/cross2/Dockerfile

@@ -1,27 +1,30 @@
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get build-dep -y clang llvm && apt-get install -y \
+COPY scripts/cross-apt-packages.sh /scripts/
+RUN sh /scripts/cross-apt-packages.sh
+
+RUN apt-get build-dep -y clang llvm && apt-get install -y --no-install-recommends \
   build-essential \
-  bzip2 \
-  ca-certificates \
-  cmake \
-  curl \
-  file \
-  g++ \
-  gdb \
-  git \
   libedit-dev \
-  make \
+  libgmp-dev \
+  libisl-dev \
+  libmpc-dev \
+  libmpfr-dev \
   ninja-build \
   nodejs \
   python2.7-dev \
-  sudo \
-  xz-utils \
+  software-properties-common \
   unzip
 
+RUN apt-key adv --batch --yes --keyserver keyserver.ubuntu.com --recv-keys 74DA7924C5513486
+RUN add-apt-repository -y 'deb http://apt.dilos.org/dilos dilos2-testing main'
+
 WORKDIR /tmp
-COPY dist-fuchsia/shared.sh dist-fuchsia/build-toolchain.sh /tmp/
-RUN /tmp/build-toolchain.sh
+COPY cross2/shared.sh cross2/build-fuchsia-toolchain.sh /tmp/
+COPY cross2/build-solaris-toolchain.sh /tmp/
+RUN /tmp/build-fuchsia-toolchain.sh
+RUN /tmp/build-solaris-toolchain.sh x86_64  amd64   solaris-i386
+RUN /tmp/build-solaris-toolchain.sh sparcv9 sparcv9 solaris-sparc
 
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
@@ -32,10 +35,18 @@ ENV \
     CXX_x86_64_unknown_fuchsia=x86_64-unknown-fuchsia-clang++ \
     AR_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-ar \
     CC_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang \
-    CXX_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang++
+    CXX_aarch64_unknown_fuchsia=aarch64-unknown-fuchsia-clang++ \
+    AR_sparcv9_sun_solaris=sparcv9-sun-solaris2.11-ar \
+    CC_sparcv9_sun_solaris=sparcv9-sun-solaris2.11-sysroot \
+    CXX_sparcv9_sun_solaris=sparcv9-sun-solaris2.11-g++ \
+    AR_x86_64_sun_solaris=x86_64-sun-solaris2.11-ar \
+    CC_x86_64_sun_solaris=x86_64-sun-solaris2.11-sysroot \
+    CXX_x86_64_sun_solaris=x86_64-sun-solaris2.11-g++
 
 ENV TARGETS=x86_64-unknown-fuchsia
 ENV TARGETS=$TARGETS,aarch64-unknown-fuchsia
+ENV TARGETS=$TARGETS,sparcv9-sun-solaris
+ENV TARGETS=$TARGETS,x86_64-sun-solaris
 
 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

src/ci/docker/dist-solaris/build-toolchain.sh → src/ci/docker/cross2/build-solaris-toolchain.sh

@@ -10,29 +10,14 @@
 # except according to those terms.
 
 set -ex
+source shared.sh
 
 ARCH=$1
 LIB_ARCH=$2
 APT_ARCH=$3
 BINUTILS=2.28.1
 GCC=6.4.0
 
-hide_output() {
-  set +x
-  on_err="
-echo ERROR: An error was encountered with the build.
-cat /tmp/build.log
-exit 1
-"
-  trap "$on_err" ERR
-  bash -c "while true; do sleep 30; echo \$(date) - building ...; done" &
-  PING_LOOP_PID=$!
-  $@ &> /tmp/build.log
-  trap - ERR
-  kill $PING_LOOP_PID
-  set -x
-}
-
 # First up, build binutils
 mkdir binutils
 cd binutils