mirror of
https://github.com/bensuperpc/dockcross.git
synced 2024-11-10 05:07:26 +01:00
Merge pull request #329 from JonasVautherin/326-set-cmake-crosscompiling-manylinux
Manylinux toolchains: restore CMAKE_CROSSCOMPILING
This commit is contained in:
commit
865e0490ab
@ -1,14 +1,11 @@
|
|||||||
set(CMAKE_SYSTEM_NAME Linux)
|
set(CMAKE_SYSTEM_NAME Linux)
|
||||||
|
set(CMAKE_CROSSCOMPILING FALSE)
|
||||||
set(CMAKE_SYSTEM_VERSION 1)
|
set(CMAKE_SYSTEM_VERSION 1)
|
||||||
set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
||||||
|
|
||||||
set(MANYLINUX1 TRUE)
|
set(MANYLINUX1 TRUE)
|
||||||
|
|
||||||
set(cross_triple "x86_64-linux-gnu")
|
|
||||||
|
|
||||||
set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc)
|
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_CXX_COMPILER /opt/rh/devtoolset-2/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-2/root/usr/bin/gfortran)
|
set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gfortran)
|
||||||
|
|
||||||
set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop)
|
|
||||||
|
@ -1,11 +1,10 @@
|
|||||||
set(CMAKE_SYSTEM_NAME Linux)
|
set(CMAKE_SYSTEM_NAME Linux)
|
||||||
|
set(CMAKE_CROSSCOMPILING FALSE)
|
||||||
set(CMAKE_SYSTEM_VERSION 1)
|
set(CMAKE_SYSTEM_VERSION 1)
|
||||||
set(CMAKE_SYSTEM_PROCESSOR i686)
|
set(CMAKE_SYSTEM_PROCESSOR i686)
|
||||||
|
|
||||||
set(MANYLINUX1 TRUE)
|
set(MANYLINUX1 TRUE)
|
||||||
|
|
||||||
set(cross_triple "i686-linux-gnu")
|
|
||||||
|
|
||||||
set(CMAKE_C_COMPILER /opt/rh/devtoolset-2/root/usr/bin/gcc)
|
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_CXX_COMPILER /opt/rh/devtoolset-2/root/usr/bin/g++)
|
||||||
set(CMAKE_ASM_COMPILER ${CMAKE_C_COMPILER})
|
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
|
# Discard path returned by pkg-config and associated with HINTS in module
|
||||||
# like FindOpenSSL.
|
# like FindOpenSSL.
|
||||||
set(CMAKE_IGNORE_PATH /usr/lib/x86_64-linux-gnu/ /usr/lib/x86_64-linux-gnu/lib/)
|
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)
|
|
||||||
|
@ -1,14 +1,11 @@
|
|||||||
set(CMAKE_SYSTEM_NAME Linux)
|
set(CMAKE_SYSTEM_NAME Linux)
|
||||||
|
set(CMAKE_CROSSCOMPILING FALSE)
|
||||||
set(CMAKE_SYSTEM_VERSION 1)
|
set(CMAKE_SYSTEM_VERSION 1)
|
||||||
set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
set(CMAKE_SYSTEM_PROCESSOR x86_64)
|
||||||
|
|
||||||
set(MANYLINUX2010 TRUE)
|
set(MANYLINUX2010 TRUE)
|
||||||
|
|
||||||
set(cross_triple "x86_64-linux-gnu")
|
|
||||||
|
|
||||||
set(CMAKE_C_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gcc)
|
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_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-8/root/usr/bin/gfortran)
|
set(CMAKE_Fortran_COMPILER /opt/rh/devtoolset-8/root/usr/bin/gfortran)
|
||||||
|
|
||||||
set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/${cross_triple}-noop)
|
|
||||||
|
Loading…
Reference in New Issue
Block a user