From 550db91811b39923289cd03a4abb6646cfae45e3 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 30 Apr 2024 13:28:10 -0400 Subject: [PATCH] Replace gcc12 with gcc11 due to binutils 2.38 bug (#4663) Signed-off-by: Peter Zhu --- docker/ci/config/gcc-toolset-11-setup | 1 + docker/ci/config/gcc-toolset-12-setup | 1 - ...build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100755 docker/ci/config/gcc-toolset-11-setup delete mode 100755 docker/ci/config/gcc-toolset-12-setup diff --git a/docker/ci/config/gcc-toolset-11-setup b/docker/ci/config/gcc-toolset-11-setup new file mode 100755 index 0000000000..ed7c7ce7ac --- /dev/null +++ b/docker/ci/config/gcc-toolset-11-setup @@ -0,0 +1 @@ +. /opt/rh/gcc-toolset-11/enable diff --git a/docker/ci/config/gcc-toolset-12-setup b/docker/ci/config/gcc-toolset-12-setup deleted file mode 100755 index f7aa467fb1..0000000000 --- a/docker/ci/config/gcc-toolset-12-setup +++ /dev/null @@ -1 +0,0 @@ -. /opt/rh/gcc-toolset-12/enable diff --git a/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile b/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile index 09cbb05417..498baa0e09 100644 --- a/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile +++ b/docker/ci/dockerfiles/current/build.almalinux8.opensearch.x64.arm64.ppc64le.dockerfile @@ -90,9 +90,9 @@ RUN pip3 install cmake==3.23.3 # Upgrade gcc # The setup part is partially based on Austin Dewey's article: # https://austindewey.com/2019/03/26/enabling-software-collections-binaries-on-a-docker-image/ -RUN dnf -y install gcc-toolset-12-gcc gcc-toolset-12-gcc-c++ && dnf clean all && \ - echo "source /opt/rh/gcc-toolset-12/enable" > /etc/profile.d/gcc-toolset-12.sh -COPY --chown=0:0 config/gcc-toolset-12-setup /usr/local/bin/gcc_setup +RUN dnf -y install gcc-toolset-11-gcc gcc-toolset-11-gcc-c++ && dnf clean all && \ + echo "source /opt/rh/gcc-toolset-11/enable" > /etc/profile.d/gcc-toolset-11.sh +COPY --chown=0:0 config/gcc-toolset-11-setup /usr/local/bin/gcc_setup ENV BASH_ENV="/usr/local/bin/gcc_setup" ENV ENV="/usr/local/bin/gcc_setup" ENV PROMPT_COMMAND=". /usr/local/bin/gcc_setup"