From b552a5f05d9728b0c32c56134c37266206db56be Mon Sep 17 00:00:00 2001 From: maxice8 Date: Wed, 3 Oct 2018 03:07:08 -0300 Subject: [PATCH] build-style/cmake.sh: set CMAKE_SYSTEM_PROCESSOR on cross-builds --- common/build-style/cmake.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index b152c977f3a..1b37fddba63 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -7,6 +7,14 @@ do_configure() { cd ${cmake_builddir} if [ "$CROSS_BUILD" ]; then + case "$XBPS_TARGET_MACHINE" in + x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;; + i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;; + aarch64*) _CMAKE_SYSTEM_PROCESSOR=aarch64 ;; + arm*) _CMAKE_SYSTEM_PROCESSOR=arm ;; + mips*) _CMAKE_SYSTEM_PROCESSOR=mips ;; + *) _CMAKE_SYSTEM_PROCESSOR=generic ;; + esac cat > cross_${XBPS_CROSS_TRIPLET}.cmake <<_EOF SET(CMAKE_SYSTEM_NAME Linux) SET(CMAKE_SYSTEM_VERSION 1) @@ -15,6 +23,8 @@ SET(CMAKE_C_COMPILER ${CC}) SET(CMAKE_CXX_COMPILER ${CXX}) SET(CMAKE_CROSSCOMPILING TRUE) +SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR}) + SET(CMAKE_FIND_ROOT_PATH ${XBPS_CROSS_BASE}) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)