diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/cross2/Dockerfile | 43 | ||||
| -rwxr-xr-x | src/ci/docker/cross2/build-solaris-toolchain.sh (renamed from src/ci/docker/dist-solaris/build-toolchain.sh) | 17 | ||||
| -rw-r--r-- | src/ci/docker/dist-solaris/Dockerfile | 29 |
3 files changed, 28 insertions, 61 deletions
diff --git a/src/ci/docker/cross2/Dockerfile b/src/ci/docker/cross2/Dockerfile index bcd95924b42..6f854197191 100644 --- a/src/ci/docker/cross2/Dockerfile +++ b/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 \ No newline at end of file +ENV SCRIPT python2.7 ../x.py dist --target $TARGETS diff --git a/src/ci/docker/dist-solaris/build-toolchain.sh b/src/ci/docker/cross2/build-solaris-toolchain.sh index c0d839a5fb7..4ff26b5dfab 100755 --- a/src/ci/docker/dist-solaris/build-toolchain.sh +++ b/src/ci/docker/cross2/build-solaris-toolchain.sh @@ -10,6 +10,7 @@ # except according to those terms. set -ex +source shared.sh ARCH=$1 LIB_ARCH=$2 @@ -17,22 +18,6 @@ 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 diff --git a/src/ci/docker/dist-solaris/Dockerfile b/src/ci/docker/dist-solaris/Dockerfile deleted file mode 100644 index a60c9956b75..00000000000 --- a/src/ci/docker/dist-solaris/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM ubuntu:16.04 - -COPY scripts/cross-apt-packages.sh /scripts/ -RUN sh /scripts/cross-apt-packages.sh - -RUN apt-get install -y --no-install-recommends \ - software-properties-common libgmp-dev libmpfr-dev libmpc-dev libisl-dev -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' - -COPY dist-solaris/build-toolchain.sh /tmp/ -RUN /tmp/build-toolchain.sh x86_64 amd64 solaris-i386 -RUN /tmp/build-toolchain.sh sparcv9 sparcv9 solaris-sparc - -COPY scripts/sccache.sh /scripts/ -RUN sh /scripts/sccache.sh - -ENV \ - 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=sparcv9-sun-solaris,x86_64-sun-solaris - -ENV RUST_CONFIGURE_ARGS --target=$TARGETS --enable-extended -ENV SCRIPT python2.7 ../x.py dist --target $TARGETS |