Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2025-01-22 14:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

manylinux2010-x86: Fix tests updating path to devtoolset compilers

Browse Source 
Fixes #406
This commit is contained in:
Jean-Christophe Fillion-Robin 2020-05-06 21:24:30 -04:00
parent c409cffbf6
commit 2e0da22870
No known key found for this signature in database
GPG Key ID: 087FCBD046CD7ADB
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manylinux2010-x86/Dockerfile.in
View File

@ -13,7 +13,7 @@ RUN echo $'#!/bin/bash\n\
LD_PRELOAD=/usr/lib/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum LD_PRELOAD=/usr/lib/libcurl.so.4 /usr/bin/yum "$@"' > /usr/local/bin/yum && chmod a+x /usr/local/bin/yum
ENV CROSS_TRIPLE i686-linux-gnu ENV CROSS_TRIPLE i686-linux-gnu
ENV CROSS_ROOT /opt/rh/devtoolset-7/root/usr/bin ENV CROSS_ROOT /opt/rh/devtoolset-8/root/usr/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 \

6
manylinux2010-x86/Toolchain.cmake
View File

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