Skip to content

Commit 8fc0b37

Browse files
committed
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.
1 parent 29dece1 commit 8fc0b37

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/ci/docker/dist-x86-linux/Dockerfile

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,7 @@ RUN yum upgrade -y && yum install -y \
2121
ENV PATH=/rustroot/bin:$PATH
2222
ENV LD_LIBRARY_PATH=/rustroot/lib64:/rustroot/lib
2323
WORKDIR /tmp
24-
25-
# binutils < 2.22 has a bug where the 32-bit executables it generates
26-
# immediately segfault in Rust, so we need to install our own binutils.
27-
#
28-
# See https://github.com/rust-lang/rust/issues/20440 for more info
2924
COPY shared.sh build-binutils.sh /tmp/
30-
RUN ./build-binutils.sh
31-
32-
# Need a newer version of gcc than centos has to compile LLVM nowadays
33-
COPY build-gcc.sh /tmp/
34-
RUN ./build-gcc.sh
3525

3626
# We need a build of openssl which supports SNI to download artifacts from
3727
# static.rust-lang.org. This'll be used to link into libcurl below (and used
@@ -49,6 +39,16 @@ RUN ./build-openssl.sh
4939
COPY build-curl.sh /tmp/
5040
RUN ./build-curl.sh
5141

42+
# binutils < 2.22 has a bug where the 32-bit executables it generates
43+
# immediately segfault in Rust, so we need to install our own binutils.
44+
#
45+
# See https://github.com/rust-lang/rust/issues/20440 for more info
46+
RUN ./build-binutils.sh
47+
48+
# Need a newer version of gcc than centos has to compile LLVM nowadays
49+
COPY build-gcc.sh /tmp/
50+
RUN ./build-gcc.sh
51+
5252
# CentOS 5.5 has Python 2.4 by default, but LLVM needs 2.7+
5353
COPY build-python.sh /tmp/
5454
RUN ./build-python.sh

0 commit comments

Comments
 (0)