From: nbd Date: Mon, 25 Jan 2016 15:49:49 +0000 (+0000) Subject: include/cmake.mk: search in $(STAGING_DIR)/usr instead of plain $(STAGING_DIR) to... X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=db878fdd2691c73ce9c38d26c0908f02b600465f;p=openwrt.git include/cmake.mk: search in $(STAGING_DIR)/usr instead of plain $(STAGING_DIR) to avoid picking up stuff from host/ Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48492 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/include/cmake.mk b/include/cmake.mk index 0794c31f5c..a15cf3a671 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -28,7 +28,7 @@ CMAKE_AR:=$(call cmake_tool,$(TARGET_AR)) 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_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT)) CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST) CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions