Merge pull request #152 from rillian/late-gcc

Fix TLS incompatibility by building gcc after openssl

Author: alexcrichton

slaves/dist/Dockerfile

@@ -27,13 +27,6 @@ RUN mkdir /buildslave && chown rustbuild:rustbuild /buildslave
 RUN mkdir /home/rustbuild
 RUN chown rustbuild:rustbuild /home/rustbuild
 
-# Install gcc 4.7 which has C++11 support which is required by LLVM
-#
-# After we're done building we erase the binutils/gcc installs from CentOS to
-# ensure that we always use the ones that we just built.
-COPY dist/build_gcc.sh /build/
-RUN /bin/bash build_gcc.sh && rm -rf /build
-
 # 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
 # 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
 COPY dist/build_curl.sh /build/
 RUN /bin/bash build_curl.sh
 
+# Install gcc 4.7 which has C++11 support which is required by LLVM
+#
+# After we're done building we erase the binutils/gcc installs from CentOS to
+# ensure that we always use the ones that we just built.
+COPY dist/build_gcc.sh /build/
+RUN /bin/bash build_gcc.sh && rm -rf /build
+
 # 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.
 #

slaves/dist/build_curl.sh

@@ -2,8 +2,8 @@
 
 set -ex
 
-VERSION=7.51.0
-SHA256=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde
+VERSION=7.52.1
+SHA256=d16185a767cb2c1ba3d5b9096ec54e5ec198b213f45864a38b3bda4bbf87389b
 
 curl http://cool.haxx.se/download/curl-$VERSION.tar.bz2 | \
   tee >(sha256sum > curl-$VERSION.tar.bz2.sha256)       | tar xjf -

slaves/dist/build_git.sh

@@ -2,8 +2,8 @@
 
 set -ex
 
-VERSION=2.10.0
-SHA256=207cfce8cc0a36497abb66236817ef449a45f6ff9141f586bbe2aafd7bc3d90b
+VERSION=2.11.0
+SHA256=d3be9961c799562565f158ce5b836e2b90f38502d3992a115dfb653d7825fd7e
 
 yum install -y gettext autoconf
 curl https://www.kernel.org/pub/software/scm/git/git-$VERSION.tar.gz | \

slaves/dist/build_openssl.sh

@@ -2,8 +2,8 @@
 
 set -ex
 
-VERSION=1.0.2j
-SHA256=e7aff292be21c259c6af26469c7a9b3ba26e9abaaffd325e3dccc9785256c431
+VERSION=1.0.2k
+SHA256=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 
 yum install -y setarch
 curl ftp://ftp.openssl.org/source/openssl-$VERSION.tar.gz | \