Skip to content

Commit 8740e55

Browse files
committed
Use GCC 9.2.0 instead of 9.5.0
Because of unsoundness found in GCC 9.3+.
1 parent ba86c04 commit 8740e55

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,11 @@ WORKDIR /tmp
4646
RUN mkdir /home/user
4747
COPY scripts/shared.sh /tmp/
4848

49-
# Need at least GCC 5.1 to compile LLVM
49+
# Need at least GCC 9 to compile LLVM
50+
# GCC 9.3+ have an unsoundness problem (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95189), so we
51+
# stay at 9.2.0.
5052
COPY scripts/build-gcc.sh /tmp/
51-
ENV GCC_VERSION=9.5.0
53+
ENV GCC_VERSION=9.2.0
5254
ENV GCC_BUILD_TARGET=aarch64-unknown-linux-gnu
5355
RUN ./build-gcc.sh && yum remove -y gcc gcc-c++
5456

src/ci/docker/host-x86_64/dist-i686-linux/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ WORKDIR /tmp
4949
RUN mkdir /home/user
5050
COPY scripts/shared.sh /tmp/
5151

52-
# Need at least GCC 5.1 to compile LLVM nowadays
52+
# Need at least GCC 9 to compile LLVM
53+
# GCC 9.3+ have an unsoundness problem (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95189), so we
54+
# stay at 9.2.0.
5355
COPY scripts/build-gcc.sh /tmp/
54-
ENV GCC_VERSION=9.5.0
56+
ENV GCC_VERSION=9.2.0
5557
ENV GCC_BUILD_TARGET=i686-pc-linux-gnu
5658
RUN ./build-gcc.sh && yum remove -y gcc gcc-c++
5759

src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ WORKDIR /tmp
5252
RUN mkdir /home/user
5353
COPY scripts/shared.sh /tmp/
5454

55-
# Need at least GCC 5.1 to compile LLVM nowadays
55+
# Need at least GCC 9 to compile LLVM
56+
# GCC 9.3+ have an unsoundness problem (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=95189), so we
57+
# stay at 9.2.0.
5658
COPY scripts/build-gcc.sh /tmp/
57-
ENV GCC_VERSION=9.5.0
59+
ENV GCC_VERSION=9.2.0
5860
ENV GCC_BUILD_TARGET=x86_64-pc-linux-gnu
5961
RUN ./build-gcc.sh && yum remove -y gcc gcc-c++
6062

src/ci/docker/scripts/build-gcc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ source shared.sh
77
# This version is specified in the Dockerfile
88
GCC=$GCC_VERSION
99

10-
curl https://ftp.gnu.org/gnu/gcc/gcc-$GCC/gcc-$GCC.tar.xz | xzcat | tar xf -
10+
curl https://ci-mirrors.rust-lang.org/rustc/gcc/gcc-$GCC.tar.xz | xzcat | tar xf -
1111
cd gcc-$GCC
1212

1313
# FIXME(#49246): Remove the `sed` below.

0 commit comments

Comments
 (0)