manylinux_2_28-x64: Update for gcc-toolset-12

Closes #746
dockcross · Dec 1, 2022 · 21fdaf8 · 21fdaf8
1 parent 08e2f6e
commit 21fdaf8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/common/common.manylinux_2_28 b/common/common.manylinux_2_28
@@ -21,7 +21,7 @@ RUN \
   set -x && \
   # Remove sudo provided by devtoolset since it doesn't work with
   # 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 && \
   rm -rf /buildscripts
 

diff --git a/manylinux_2_28-x64/Dockerfile.in b/manylinux_2_28-x64/Dockerfile.in
@@ -12,7 +12,7 @@ ENV DEFAULT_DOCKCROSS_IMAGE dockcross/manylinux_2_28-x64
 #include "common.docker"
 
 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 \
     AR=${CROSS_ROOT}/ar \
     CC=${CROSS_ROOT}/gcc \

diff --git a/manylinux_2_28-x64/Toolchain.cmake b/manylinux_2_28-x64/Toolchain.cmake
@@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
 
 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_CXX_COMPILER ${CROSS_ROOT}/g++)
 set(CMAKE_ASM_COMPILER ${CROSS_ROOT}/as)