Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

manylinux_2_28-x64: Update for gcc-toolset-12

Browse Source 
Closes #746
This commit is contained in:
Matt McCormick 2022-11-30 15:41:47 -05:00 committed by Jonas Vautherin
parent 08e2f6eec1
commit 21fdaf8b9e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/common.manylinux_2_28
View File

@ -21,7 +21,7 @@ RUN \
set -x && \ set -x && \
# Remove sudo provided by devtoolset since it doesn't work with # Remove sudo provided by devtoolset since it doesn't work with
# our sudo wrapper calling gosu. # our sudo wrapper calling gosu.
rm -f /opt/rh/gcc-toolset-11/root/usr/bin/sudo && \ rm -f /opt/rh/gcc-toolset-12/root/usr/bin/sudo && \
/buildscripts/install-python-packages.sh && \ /buildscripts/install-python-packages.sh && \
rm -rf /buildscripts rm -rf /buildscripts

2
manylinux_2_28-x64/Dockerfile.in
View File

@ -12,7 +12,7 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux_2_28-x64
#include "common.docker" #include "common.docker"
ENV CROSS_TRIPLE x86_64-linux-gnu ENV CROSS_TRIPLE x86_64-linux-gnu
ENV CROSS_ROOT /opt/rh/gcc-toolset-11/root/bin/ ENV CROSS_ROOT /opt/rh/gcc-toolset-12/root/bin/
ENV AS=${CROSS_ROOT}/as \ ENV AS=${CROSS_ROOT}/as \
AR=${CROSS_ROOT}/ar \ AR=${CROSS_ROOT}/ar \
CC=${CROSS_ROOT}/gcc \ CC=${CROSS_ROOT}/gcc \

2
manylinux_2_28-x64/Toolchain.cmake
View File

@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(MANYLINUX_2_28 TRUE) set(MANYLINUX_2_28 TRUE)
set(CROSS_ROOT /opt/rh/gcc-toolset-11/root/bin/) set(CROSS_ROOT /opt/rh/gcc-toolset-12/root/bin/)
set(CMAKE_C_COMPILER ${CROSS_ROOT}/gcc) set(CMAKE_C_COMPILER ${CROSS_ROOT}/gcc)
set(CMAKE_CXX_COMPILER ${CROSS_ROOT}/g++) set(CMAKE_CXX_COMPILER ${CROSS_ROOT}/g++)
set(CMAKE_ASM_COMPILER ${CROSS_ROOT}/as) set(CMAKE_ASM_COMPILER ${CROSS_ROOT}/as)