Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-06-11 05:29:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix manylinux and update to devtoolset-10

Browse Source 
Fix manylinux and update to devtoolset-10

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc
2021-08-06 20:50:46 +02:00
parent 09e8f01e94
commit e25f67aea9
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manylinux2014-x64/Dockerfile.in
View File

@ -16,7 +16,7 @@ RUN echo $'#!/bin/bash\n\
LD_PRELOAD=/usr/lib64/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum
ENV CROSS_TRIPLE x86_64-linux-gnu
ENV CROSS_ROOT /opt/rh/devtoolset-9/root/usr/bin
ENV CROSS_ROOT /opt/rh/devtoolset-10/root/usr/bin
ENV AS=${CROSS_ROOT}/as \
AR=${CROSS_ROOT}/ar \
CC=${CROSS_ROOT}/gcc \

6
manylinux2014-x64/Toolchain.cmake
View File

@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(MANYLINUX2014 TRUE)
set(CMAKE_C_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gcc)
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-9/root/usr/bin/g++)
set(CMAKE_C_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gcc)
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-10/root/usr/bin/g++)
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gfortran)
set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-10/root/usr/bin/gfortran)