Author: nbd Date: 2015-03-16 08:51:45 +0100 (Mon, 16 Mar 2015) New Revision: 44825
Modified: trunk/include/cmake.mk Log: cmake: include external toolchain directory in CMAKE_FIND_ROOT_PATH (fixes #19074) Signed-off-by: Felix Fietkau <[email protected]> Modified: trunk/include/cmake.mk =================================================================== --- trunk/include/cmake.mk 2015-03-16 07:41:24 UTC (rev 44824) +++ trunk/include/cmake.mk 2015-03-16 07:51:45 UTC (rev 44825) @@ -31,6 +31,8 @@ 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)) + define Build/Configure/Default (cd $(PKG_BUILD_DIR); \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ @@ -53,7 +55,7 @@ -DCMAKE_AR="$(CMAKE_AR)" \ -DCMAKE_NM="$(CMAKE_NM)" \ -DCMAKE_RANLIB="$(CMAKE_RANLIB)" \ - -DCMAKE_FIND_ROOT_PATH="$(STAGING_DIR);$(TOOLCHAIN_DIR)" \ + -DCMAKE_FIND_ROOT_PATH="$(CMAKE_FIND_ROOT_PATH)" \ -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \ -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \ -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
