diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-25 15:49:44 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-25 15:49:44 +0000 |
| commit | 8d94947e8df19821ff4eb952fb2b703d20a9cad9 (patch) | |
| tree | dcd498d227590dddb5959505edd6b9603dcd1dde /include/cmake.mk | |
| parent | 509fcb6dff513d6d457d91f478453b5509429920 (diff) | |
| download | master-187ad058-8d94947e8df19821ff4eb952fb2b703d20a9cad9.tar.gz master-187ad058-8d94947e8df19821ff4eb952fb2b703d20a9cad9.tar.bz2 master-187ad058-8d94947e8df19821ff4eb952fb2b703d20a9cad9.zip | |
include/cmake.mk: adjust for STAGING_DIR_HOST split
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48491 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include/cmake.mk')
| -rw-r--r-- | include/cmake.mk | 6 |
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) \ |