aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-01-25 15:49:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-01-25 15:49:44 +0000
commit7b5236de85a7d4fb5bb77d4a6fcbff89f127b070 (patch)
tree9ee1f494c643fd91e653b2ed26e48366f3bc1e2b
parent07160c774c5d5652fb340f523613c4519fb719be (diff)
downloadupstream-7b5236de85a7d4fb5bb77d4a6fcbff89f127b070.tar.gz
upstream-7b5236de85a7d4fb5bb77d4a6fcbff89f127b070.tar.bz2
upstream-7b5236de85a7d4fb5bb77d4a6fcbff89f127b070.zip
include/cmake.mk: adjust for STAGING_DIR_HOST split
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48491
-rw-r--r--include/cmake.mk6
1 files changed, 3 insertions, 3 deletions
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) \