From a15af057530723f02222884f39e3eb2fd361b858 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Wed, 12 Jun 2019 02:43:44 +0200 Subject: [PATCH] Manylinux toolchains: restore CMAKE_CROSSCOMPILING to FALSE after setting CMAKE_SYSTEM_NAME Then CMAKE_CROSSCOMPILING_EMULATOR (and therefore cross_triple) are not needed anymore. --- manylinux1-x64/Toolchain.cmake | 5 +---- manylinux1-x86/Toolchain.cmake | 5 +---- manylinux2010-x64/Toolchain.cmake | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/manylinux1-x64/Toolchain.cmake b/manylinux1-x64/Toolchain.cmake index f67767d..b9a4bb2 100644 --- a/manylinux1-x64/Toolchain.cmake +++ b/manylinux1-x64/Toolchain.cmake @@ -1,14 +1,11 @@ set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_CROSSCOMPILING FALSE) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR x86_64) set(MANYLINUX1 TRUE) -set(cross_triple "x86_64-linux-gnu") - set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc) set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++) set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran) - -set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop) diff --git a/manylinux1-x86/Toolchain.cmake b/manylinux1-x86/Toolchain.cmake index bbacb58..eee5eb7 100644 --- a/manylinux1-x86/Toolchain.cmake +++ b/manylinux1-x86/Toolchain.cmake @@ -1,11 +1,10 @@ set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_CROSSCOMPILING FALSE) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR i686) set(MANYLINUX1 TRUE) -set(cross_triple "i686-linux-gnu") - set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc) set(CMAKE_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++) set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER}) @@ -14,5 +13,3 @@ set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran) # Discard path returned by pkg-config and associated with HINTS in module # like FindOpenSSL. set(CMAKE_IGNORE_PATH /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/lib/) - -set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop) diff --git a/manylinux2010-x64/Toolchain.cmake b/manylinux2010-x64/Toolchain.cmake index 0db55cc..7a982de 100644 --- a/manylinux2010-x64/Toolchain.cmake +++ b/manylinux2010-x64/Toolchain.cmake @@ -1,14 +1,11 @@ set(CMAKE_SYSTEM_NAME Linux) +set(CMAKE_CROSSCOMPILING FALSE) set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_PROCESSOR x86_64) set(MANYLINUX2010 TRUE) -set(cross_triple "x86_64-linux-gnu") - 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-8/root/usr/bin/gfortran) - -set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop)