From 2e0da2287053d454540a291a2696b2515c52c05f Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Wed, 6 May 2020 21:24:30 -0400 Subject: [PATCH 1/2] manylinux2010-x86: Fix tests updating path to devtoolset compilers Fixes #406 --- manylinux2010-x86/Dockerfile.in | 2 +- manylinux2010-x86/Toolchain.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manylinux2010-x86/Dockerfile.in b/manylinux2010-x86/Dockerfile.in index 9bb7bed..93b4b3d 100644 --- a/manylinux2010-x86/Dockerfile.in +++ b/manylinux2010-x86/Dockerfile.in @@ -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 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 \ AR=${CROSS_ROOT}/ar \ CC=${CROSS_ROOT}/gcc \ diff --git a/manylinux2010-x86/Toolchain.cmake b/manylinux2010-x86/Toolchain.cmake index cef1e85..54230bb 100644 --- a/manylinux2010-x86/Toolchain.cmake +++ b/manylinux2010-x86/Toolchain.cmake @@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR i686) set(MANYLINUX2010 TRUE) -set(CMAKE_C_COMPILER /opt/rh/devtoolset-7/root/usr/bin/gcc) -set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-7/root/usr/bin/g++) +set(CMAKE_C_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gcc) +set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-8/root/usr/bin/g++) 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) From 549303ece1950f8e9ea22ffb0b4c6cf04d3c2ada Mon Sep 17 00:00:00 2001 From: Jean-Christophe Fillion-Robin Date: Thu, 7 May 2020 05:24:46 -0400 Subject: [PATCH 2/2] manylinux2014-x64: Fix tests updating path to devtoolset compilers --- manylinux2014-x64/Dockerfile.in | 2 +- manylinux2014-x64/Toolchain.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manylinux2014-x64/Dockerfile.in b/manylinux2014-x64/Dockerfile.in index a547ff1..bb82078 100644 --- a/manylinux2014-x64/Dockerfile.in +++ b/manylinux2014-x64/Dockerfile.in @@ -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 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 \ AR=${CROSS_ROOT}/ar \ CC=${CROSS_ROOT}/gcc \ diff --git a/manylinux2014-x64/Toolchain.cmake b/manylinux2014-x64/Toolchain.cmake index fe89e3c..4b2d037 100644 --- a/manylinux2014-x64/Toolchain.cmake +++ b/manylinux2014-x64/Toolchain.cmake @@ -5,7 +5,7 @@ set(CMAKE_SYSTEM_PROCESSOR x86_64) set(MANYLINUX2014 TRUE) -set(CMAKE_C_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gcc) -set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-8/root/usr/bin/g++) +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_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)