Author: nbd Date: 2016-01-25 16:49:44 +0100 (Mon, 25 Jan 2016) New Revision: 48491
Modified: trunk/include/cmake.mk Log: include/cmake.mk: adjust for STAGING_DIR_HOST split Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/include/cmake.mk =================================================================== --- trunk/include/cmake.mk 2016-01-25 15:49:36 UTC (rev 48490) +++ trunk/include/cmake.mk 2016-01-25 15:49:44 UTC (rev 48491) @@ -29,7 +29,7 @@ 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 @@ -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) \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
