From f7cc827d38912b4dadb7c5f45ec26b1011f38810 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 1 Nov 2020 19:37:41 +0700 Subject: [PATCH] build-style/cmake: only look into masterdir libraries As of it's now, cmake will look into host's libraries, thus bootstrapping will fail at ccache if host system doesn't have libzstd-devel installed. --- common/build-style/cmake.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/common/build-style/cmake.sh b/common/build-style/cmake.sh index ef0715ef2e4..fbbb6a8d950 100644 --- a/common/build-style/cmake.sh +++ b/common/build-style/cmake.sh @@ -6,7 +6,21 @@ do_configure() { [ ! -d ${cmake_builddir:=build} ] && mkdir -p ${cmake_builddir} cd ${cmake_builddir} - if [ "$CROSS_BUILD" ]; then + if [ -z "$CHROOT_READY" ]; then + cat >bootstrap.cmake <<_EOF +SET(CMAKE_SYSTEM_NAME Linux) +SET(CMAKE_SYSTEM_VERSION 1) + +SET(CMAKE_C_COMPILER ${CC}) +SET(CMAKE_CXX_COMPILER ${CXX}) + +SET(CMAKE_FIND_ROOT_PATH ${XBPS_MASTERDIR}) + +SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) +SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +_EOF + configure_args+=" -DCMAKE_TOOLCHAIN_FILE=bootstrap.cmake" + elif [ "$CROSS_BUILD" ]; then case "$XBPS_TARGET_MACHINE" in x86_64*) _CMAKE_SYSTEM_PROCESSOR=x86_64 ;; i686*) _CMAKE_SYSTEM_PROCESSOR=x86 ;;