X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fcmake.mk;h=4701020f91863cccb4a5b7e5c6a51b1cbf5d377f;hb=83623000f47ca99ab552350629ce0c53f866f24f;hp=b419f004ae2ebaafbf4f9e134a58f9901e61e412;hpb=9583dcd9a777d420d818ba3e462455ee7a9f7080;p=openwrt-10.03%2F.git

diff --git a/include/cmake.mk b/include/cmake.mk
index b419f004a..4701020f9 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -3,14 +3,25 @@ PKG_INSTALL:=1
 MAKE_FLAGS+=VERBOSE=1
 
 ifeq ($(CONFIG_CCACHE),)
-  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CC)
+ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
   CMAKE_C_COMPILER_ARG1:=
-  CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/usr/bin/$(TARGET_CXX)
+  CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)
   CMAKE_CXX_COMPILER_ARG1:=
+ else
+  CMAKE_C_COMPILER:=$(shell which $(TARGET_CC))
+  CMAKE_C_COMPILER_ARG1:=
+  CMAKE_CXX_COMPILER:=$(shell which $(TARGET_CXX))
+  CMAKE_CXX_COMPILER_ARG1:=
+ endif
 else
-  CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
+  CCACHE:=$(shell which ccache)
+  ifeq ($(CCACHE),)
+    CCACHE:=$(STAGING_DIR_HOST)/bin/ccache
+  endif
+  CMAKE_C_COMPILER:=$(CCACHE)
   CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))
-  CMAKE_CXX_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
+  CMAKE_CXX_COMPILER:=$(CCACHE)
   CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
 endif
 
@@ -18,6 +29,7 @@ define Build/Configure/Default
 	(cd $(PKG_BUILD_DIR); \
 		CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 		CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
 		cmake \
 			-DCMAKE_SYSTEM_NAME=Linux \
 			-DCMAKE_SYSTEM_VERSION=1 \
@@ -29,15 +41,16 @@ define Build/Configure/Default
 			-DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
 			-DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
 			-DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \
-			-DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
-			-DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
-			-DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
+			-DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+			-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+			-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(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 \
+			-DDL_LIBRARY=$(STAGING_DIR) \
 			$(CMAKE_OPTIONS) \
 		. \
 	)