X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=blobdiff_plain;f=include%2Fcmake.mk;h=7ff97f5df8f42671e2fe2a58d3978bb1bba5d705;hp=c83be1522e17a7032d1b6d50bf0afe6faabc2cd4;hb=01c29ab751778952a7fbcbd1586b9ba6ef27b1da;hpb=8b343d82f19ecf90636ff65b1cb030bf21203de2

diff --git a/include/cmake.mk b/include/cmake.mk
index c83be1522..7ff97f5df 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -3,9 +3,9 @@ PKG_INSTALL:=1
 MAKE_FLAGS+=VERBOSE=1
 
 ifeq ($(CONFIG_CCACHE),)
-  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
+  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CC)
   CMAKE_C_COMPILER_ARG1:=
-  CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)
+  CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CXX)
   CMAKE_CXX_COMPILER_ARG1:=
 else
   CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
@@ -33,9 +33,9 @@ define Build/Configure/Default
 			-DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
 			-DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
 			-DCMAKE_FIND_ROOT_PATH=$(STAGING_DIR) \
-			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=$(STAGING_DIR_HOST) \
-			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=$(STAGING_DIR) \
-			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=$(STAGING_DIR) \
+			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \
+			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
+			-DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
 			-DCMAKE_STRIP=: \
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			$(CMAKE_OPTIONS) \