Skip to content

Commit 88d5645

Browse files
committed
dist-x86-linux: ugrade gcc to 4.8.5
1 parent 58c701f commit 88d5645

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ RUN yum upgrade -y && yum install -y \
66
curl \
77
bzip2 \
88
gcc \
9+
gcc-c++ \
910
make \
1011
glibc-devel \
1112
perl \

src/ci/docker/dist-x86-linux/build-gcc.sh

+7-5
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ set -ex
1313

1414
source shared.sh
1515

16-
curl https://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.bz2 | tar xjf -
17-
cd gcc-4.7.4
16+
GCC=4.8.5
17+
18+
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.bz2 | tar xjf -
19+
cd gcc-$GCC
1820
./contrib/download_prerequisites
1921
mkdir ../gcc-build
2022
cd ../gcc-build
21-
hide_output ../gcc-4.7.4/configure \
23+
hide_output ../gcc-$GCC/configure \
2224
--prefix=/rustroot \
2325
--enable-languages=c,c++
2426
hide_output make -j10
@@ -27,5 +29,5 @@ ln -nsf gcc /rustroot/bin/cc
2729

2830
cd ..
2931
rm -rf gcc-build
30-
rm -rf gcc-4.7.4
31-
yum erase -y gcc binutils
32+
rm -rf gcc-$GCC
33+
yum erase -y gcc gcc-c++ binutils

0 commit comments

Comments
 (0)