From: Felix Fietkau <nbd@openwrt.org>
Date: Mon, 25 Jan 2016 15:49:44 +0000 (+0000)
Subject: include/cmake.mk: adjust for STAGING_DIR_HOST split
X-Git-Tag: v19.07.0-rc1~11292
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=7b5236de85a7d4fb5bb77d4a6fcbff89f127b070;p=openwrt%2Fstaging%2Fhauke.git

include/cmake.mk: adjust for STAGING_DIR_HOST split

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48491
---

diff --git a/include/cmake.mk b/include/cmake.mk
index 4e4169a132..0794c31f5c 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -29,7 +29,7 @@ CMAKE_NM:=$(call cmake_tool,$(TARGET_NM))
 CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB))
 
 CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR);$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT))
-CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR_HOST)
+CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST)
 CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
 
 define Build/Configure/Default
@@ -94,8 +94,8 @@ define Host/Configure/Default
 			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
 			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
 			-DCMAKE_STRIP=: \
-			-DCMAKE_INSTALL_PREFIX=$(STAGING_DIR_HOST) \
-			-DCMAKE_PREFIX_PATH=$(STAGING_DIR_HOST) \
+			-DCMAKE_INSTALL_PREFIX=$(HOST_BUILD_PREFIX) \
+			-DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
 			-DCMAKE_SKIP_RPATH=TRUE  \
 			$(CMAKE_HOST_OPTIONS) \
 		$(CMAKE_SOURCE_DIR) \