From 86a7cb8689095becbea7b5b3981eaab01db44f8b Mon Sep 17 00:00:00 2001 From: John Date: Mon, 15 Apr 2019 03:07:52 +0200 Subject: [PATCH] build-style/cmake: only set CMAKE_CROSSCOMPILING_EMULATOR when qemu is in hostdeps --- common/build-style/cmake.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index 8d6bc88d157..1260fb46e0d 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -29,7 +29,6 @@ SET(CMAKE_SYSTEM_VERSION 1) SET(CMAKE_C_COMPILER ${CC}) SET(CMAKE_CXX_COMPILER ${CXX}) SET(CMAKE_CROSSCOMPILING TRUE) -SET(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-${XBPS_TARGET_QEMU_MACHINE}-static) SET(CMAKE_SYSTEM_PROCESSOR ${_CMAKE_SYSTEM_PROCESSOR}) @@ -57,6 +56,11 @@ _EOF cmake_args+=" -DCMAKE_INSTALL_LIBDIR=lib" 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 ${cmake_args} ${configure_args} $(echo ${cmake_builddir}|sed \