From 21fdaf8b9e3309904e4d29846abb105ea927b4db Mon Sep 17 00:00:00 2001 From: Matt McCormick Date: Wed, 30 Nov 2022 15:41:47 -0500 Subject: [PATCH] manylinux_2_28-x64: Update for gcc-toolset-12 Closes #746 --- common/common.manylinux_2_28 | 2 +- manylinux_2_28-x64/Dockerfile.in | 2 +- manylinux_2_28-x64/Toolchain.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/common.manylinux_2_28 b/common/common.manylinux_2_28 index 6c0cc6f..443bb72 100644 --- 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 index 66b689f..21494ee 100644 --- 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 index 630abc0..b826bf5 100644 --- 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)