X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/992c7a513aa7851046c3077b2f67e8f239a292f8..4521add75ddf4ca49f5ebe0de8c14458cad99712:/include/cmake.mk

diff --git a/include/cmake.mk b/include/cmake.mk
index 09a0a2419..4701020f9 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -2,10 +2,34 @@ PKG_INSTALL:=1
 
 MAKE_FLAGS+=VERBOSE=1
 
+ifeq ($(CONFIG_CCACHE),)
+ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
+  CMAKE_C_COMPILER_ARG1:=
+  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
+  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:=$(CCACHE)
+  CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
+endif
+
 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 \
@@ -13,17 +37,20 @@ define Build/Configure/Default
 			-DCMAKE_BUILD_TYPE=Release \
 			-DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
 			-DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
-			-DCMAKE_C_COMPILER=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC) \
-			-DCMAKE_CXX_COMPILER=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX) \
-			-DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
-			-DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
-			-DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
+			-DCMAKE_C_COMPILER="$(CMAKE_C_COMPILER)" \
+			-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: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) \
 		. \
 	)