Skip to content

Commit

Permalink
Replace gcc12 with gcc11 due to binutils 2.38 bug (#4663)
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
peterzhuamazon committed Apr 30, 2024
1 parent f6c5985 commit 550db91
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
1 change: 1 addition & 0 deletions docker/ci/config/gcc-toolset-11-setup
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
. /opt/rh/gcc-toolset-11/enable
1 change: 0 additions & 1 deletion docker/ci/config/gcc-toolset-12-setup

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 550db91

Please sign in to comment.