Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-09-20 02:30:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #408 from jcfr/fix-manylinux2010-x86-and-manylinux2014-x64-tests

Browse Source 
Fix manylinux2014-x64 and manylinux2010-x86 tests
This commit is contained in:
Matt McCormick 2020-05-07 18:22:44 -04:00 committed by GitHub
commit 1d12174566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 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)

2
manylinux2014-x64/Dockerfile.in
View File

@ -14,7 +14,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 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_TRIPLE x86_64-linux-gnu
ENV CROSS_ROOT /opt/rh/devtoolset-8/root/usr/bin ENV CROSS_ROOT /opt/rh/devtoolset-9/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
manylinux2014-x64/Toolchain.cmake
View File

@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64)
set(MANYLINUX2014 TRUE) set(MANYLINUX2014 TRUE)
set(CMAKE_C_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gcc) set(CMAKE_C_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gcc)
set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-8/root/usr/bin/g++) set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-9/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-8/root/usr/bin/gfortran) set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-9/root/usr/bin/gfortran)