moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

build-style/cmake: only set CMAKE_CROSSCOMPILING_EMULATOR when qemu is in hostdeps

Browse source
This commit is contained in:
John 2019-04-15 03:07:52 +02:00
parent ea7b0a9de3
commit 86a7cb8689
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/build-style/cmake.sh
View file

@ -29,7 +29,6 @@ SET(CMAKE_SYSTEM_VERSION 1)
SET(CMAKE_C_COMPILER ${CC}) SET(CMAKE_C_COMPILER ${CC})
SET(CMAKE_CXX_COMPILER ${CXX}) SET(CMAKE_CXX_COMPILER ${CXX})
SET(CMAKE_CROSSCOMPILING TRUE) SET(CMAKE_CROSSCOMPILING TRUE)
SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)
SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR}) SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR})
@ -57,6 +56,11 @@ _EOF
cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib" cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib"
fi fi
if [ "${hostmakedepends}" != "${hostmakedepends/qemu-user-static/}" ]; then
echo "SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static)" \
>> cross_${XBPS_CROSS_TRIPLET}.cmake
fi
cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin" cmake_args+=" -DCMAKE_INSTALL_SBINDIR=bin"
cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \ cmake ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \