diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-16 07:51:45 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-16 07:51:45 +0000 |
| commit | da91462013061324ad20b41ac0b0327f00e36826 (patch) | |
| tree | cdc13ac171581cb175073ffeaf80074048e25879 | |
| parent | c0a15a57bda510fac081d536013d16446baf6813 (diff) | |
| download | upstream-da91462013061324ad20b41ac0b0327f00e36826.tar.gz upstream-da91462013061324ad20b41ac0b0327f00e36826.tar.bz2 upstream-da91462013061324ad20b41ac0b0327f00e36826.zip | |
cmake: include external toolchain directory in CMAKE_FIND_ROOT_PATH (fixes #19074)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 44825
| -rw-r--r-- | include/cmake.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/cmake.mk b/include/cmake.mk index 862a6a9b3f..c1fd7d9e51 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -31,6 +31,8 @@ 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)) + define Build/Configure/Default (cd $(PKG_BUILD_DIR); \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ @@ -53,7 +55,7 @@ define Build/Configure/Default -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 \ |