Skip to content
This repository was archived by the owner on Nov 21, 2018. It is now read-only.

Commit 941295c

Browse files
committed
Move gcc later in the build order.
Building openssl and curl first lets us use TLS for all later downloads. The curl/openssl included with our Centos:5 base has compatibility problems with many modern websites. This slows the cycle time since we update openssl and curl more often than gcc, which was previously first since it's one of the slowest packages to build.
1 parent e46fabc commit 941295c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

slaves/dist/Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ RUN mkdir /buildslave && chown rustbuild:rustbuild /buildslave
2727
RUN mkdir /home/rustbuild
2828
RUN chown rustbuild:rustbuild /home/rustbuild
2929

30-
# Install gcc 4.7 which has C++11 support which is required by LLVM
31-
#
32-
# After we're done building we erase the binutils/gcc installs from CentOS to
33-
# ensure that we always use the ones that we just built.
34-
COPY dist/build_gcc.sh /build/
35-
RUN /bin/bash build_gcc.sh && rm -rf /build
36-
3730
# We need a build of openssl which supports SNI to download artifacts from
3831
# static.rust-lang.org. This'll be used to link into libcurl below (and used
3932
# later as well), so build a copy of OpenSSL with dynamic libraries into our
@@ -50,6 +43,13 @@ RUN /bin/bash build_openssl.sh && rm -rf /build
5043
COPY dist/build_curl.sh /build/
5144
RUN /bin/bash build_curl.sh
5245

46+
# Install gcc 4.7 which has C++11 support which is required by LLVM
47+
#
48+
# After we're done building we erase the binutils/gcc installs from CentOS to
49+
# ensure that we always use the ones that we just built.
50+
COPY dist/build_gcc.sh /build/
51+
RUN /bin/bash build_gcc.sh && rm -rf /build
52+
5353
# binutils < 2.22 has a bug where the 32-bit executables it generates
5454
# immediately segfault in Rust, so we need to install our own binutils.
5555
#

slaves/dist/build_gcc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ VERSION=4.7.4
66
SHA256=92e61c6dc3a0a449e62d72a38185fda550168a86702dea07125ebd3ec3996282
77

88
yum install -y wget
9-
curl http://ftp.gnu.org/gnu/gcc/gcc-$VERSION/gcc-$VERSION.tar.bz2 | \
9+
curl https://ftp.gnu.org/gnu/gcc/gcc-$VERSION/gcc-$VERSION.tar.bz2 | \
1010
tee >(sha256sum > gcc-$VERSION.tar.bz2.sha256) | tar xjf -
1111
test $SHA256 = $(cut -d ' ' -f 1 gcc-$VERSION.tar.bz2.sha256) || exit 1
1212

0 commit comments

Comments
 (0)