Skip to content

Commit

Permalink
Move texinfo specifically for binutils on al2 x64
Browse files Browse the repository at this point in the history
Signed-off-by: Peter Zhu <[email protected]>
  • Loading branch information
peterzhuamazon committed Jan 24, 2025
1 parent 6bc8b80 commit 0caf81c
Show file tree
Hide file tree
Showing 2 changed files with 114,652 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,6 @@ RUN ln -sfn /usr/local/bin/python3.9 /usr/bin/python3 && \
pip3 install pip==23.1.2 && pip3 install pipenv==2023.6.12 awscli==1.32.17

# Upgrade gcc
<<<<<<< Updated upstream
RUN yum install -y gcc10* && \
mv -v /usr/bin/gcc /usr/bin/gcc7-gcc && \
mv -v /usr/bin/g++ /usr/bin/gcc7-g++ && \
mv -v /usr/bin/gfortran /usr/bin/gcc7-gfortran && \
update-alternatives --install /usr/bin/gcc gcc $(which gcc10-gcc) 1 && \
update-alternatives --install /usr/bin/g++ g++ $(which gcc10-g++) 1 && \
update-alternatives --install /usr/bin/gfortran gfortran $(which gcc10-gfortran) 1
=======
# Only x64 requires gcc 12+ for k-NN avx512_spr fp16 feature
# https://github.com/opensearch-project/opensearch-build/issues/5226
# Due to cross-compilation being too slow on arm64, it will stay on gcc 10 for the time being
Expand Down Expand Up @@ -144,7 +135,6 @@ RUN if [ `uname -m` = "x86_64" ]; then \
yum remove -y texinfo; \
fi

>>>>>>> Stashed changes
ENV FC=gfortran
ENV CXX=g++

Expand Down
Loading

0 comments on commit 0caf81c

Please sign in to comment.