diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-03-22 23:38:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 23:38:01 -0400 |
| commit | a419ce9406e198d3d336185d6feff97051701eae (patch) | |
| tree | 7b60aa1f08d07efc5f12cc5419b0314eb6683be2 | |
| parent | b5dad3a1ab28cbaacc4f71e56c063ed6be132eb0 (diff) | |
| parent | 88d5645fb861354f46d507f8d5764e79ae099519 (diff) | |
| download | rust-a419ce9406e198d3d336185d6feff97051701eae.tar.gz rust-a419ce9406e198d3d336185d6feff97051701eae.zip | |
Rollup merge of #40617 - TimNN:dist-update-gcc, r=alexcrichton
Update gcc used for dist-x86-linux builds GCC 4.7 is too old to build LLVM 4.0, so this PR updates to 4.8. r? @alexcrichton (I'll ping you again once travis is green and the test commit is removed).
| -rw-r--r-- | src/ci/docker/dist-x86-linux/Dockerfile | 1 | ||||
| -rwxr-xr-x | src/ci/docker/dist-x86-linux/build-gcc.sh | 12 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ci/docker/dist-x86-linux/Dockerfile b/src/ci/docker/dist-x86-linux/Dockerfile index 852ce1806ec..cd4c81912df 100644 --- a/src/ci/docker/dist-x86-linux/Dockerfile +++ b/src/ci/docker/dist-x86-linux/Dockerfile @@ -6,6 +6,7 @@ RUN yum upgrade -y && yum install -y \ curl \ bzip2 \ gcc \ + gcc-c++ \ make \ glibc-devel \ perl \ diff --git a/src/ci/docker/dist-x86-linux/build-gcc.sh b/src/ci/docker/dist-x86-linux/build-gcc.sh index 06198eb0c97..ab2562538d6 100755 --- a/src/ci/docker/dist-x86-linux/build-gcc.sh +++ b/src/ci/docker/dist-x86-linux/build-gcc.sh @@ -13,12 +13,14 @@ set -ex source shared.sh -curl https://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 | tar xjf - -cd gcc-4.7.4 +GCC=4.8.5 + +curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.bz2 | tar xjf - +cd gcc-$GCC ./contrib/download_prerequisites mkdir ../gcc-build cd ../gcc-build -hide_output ../gcc-4.7.4/configure \ +hide_output ../gcc-$GCC/configure \ --prefix=/rustroot \ --enable-languages=c,c++ hide_output make -j10 @@ -27,5 +29,5 @@ ln -nsf gcc /rustroot/bin/cc cd .. rm -rf gcc-build -rm -rf gcc-4.7.4 -yum erase -y gcc binutils +rm -rf gcc-$GCC +yum erase -y gcc gcc-c++ binutils |