diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-02-08 23:55:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 23:55:51 -0500 |
| commit | 1e3e904101087c11612f97bc604941e5ee85b86e (patch) | |
| tree | 1a4ac51c16de92345ef062bc86eda21c87e5d57b | |
| parent | 44fdf5bcd7026152564f5a2abc5972403cead2cb (diff) | |
| parent | 8fc0b37428e23dd031af5209bc8a22b9657ec66f (diff) | |
| download | rust-1e3e904101087c11612f97bc604941e5ee85b86e.tar.gz rust-1e3e904101087c11612f97bc604941e5ee85b86e.zip | |
Rollup merge of #39671 - alexcrichton:change-order, r=brson
travis: Fix build order of dist-x86-linux I just tried to build this container locally but it looks like connecting to ftp.gnu.org requires SNI, so let's build curl/OpenSSL first to ensure that we've got an SNI-capable client to download gcc/binutils with.
| -rw-r--r-- | src/ci/docker/dist-x86-linux/Dockerfile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/ci/docker/dist-x86-linux/Dockerfile b/src/ci/docker/dist-x86-linux/Dockerfile index a06e47c3bc9..12e24ff1af6 100644 --- a/src/ci/docker/dist-x86-linux/Dockerfile +++ b/src/ci/docker/dist-x86-linux/Dockerfile @@ -21,17 +21,7 @@ RUN yum upgrade -y && yum install -y \ ENV PATH=/rustroot/bin:$PATH ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib WORKDIR /tmp - -# binutils < 2.22 has a bug where the 32-bit executables it generates -# immediately segfault in Rust, so we need to install our own binutils. -# -# See https://github.com/rust-lang/rust/issues/20440 for more info COPY shared.sh build-binutils.sh /tmp/ -RUN ./build-binutils.sh - -# Need a newer version of gcc than centos has to compile LLVM nowadays -COPY build-gcc.sh /tmp/ -RUN ./build-gcc.sh # We need a build of openssl which supports SNI to download artifacts from # static.rust-lang.org. This'll be used to link into libcurl below (and used @@ -49,6 +39,16 @@ RUN ./build-openssl.sh COPY build-curl.sh /tmp/ RUN ./build-curl.sh +# binutils < 2.22 has a bug where the 32-bit executables it generates +# immediately segfault in Rust, so we need to install our own binutils. +# +# See https://github.com/rust-lang/rust/issues/20440 for more info +RUN ./build-binutils.sh + +# Need a newer version of gcc than centos has to compile LLVM nowadays +COPY build-gcc.sh /tmp/ +RUN ./build-gcc.sh + # CentOS 5.5 has Python 2.4 by default, but LLVM needs 2.7+ COPY build-python.sh /tmp/ RUN ./build-python.sh |