X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=include%2Fcmake.mk;h=9a5e311c3c7e8792fa33a3e9324b0e256e2c09b4;hb=c29b04470f4718590af49a980d7c8d949a2b1cc9;hp=a2ac62fcae170ebef5d9b594b9d19da592ff3cbb;hpb=a8973174d76c4256917aa76e2333a616ffd757f5;p=openwrt.git

diff --git a/include/cmake.mk b/include/cmake.mk
index a2ac62fcae..9a5e311c3c 100644
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -6,18 +6,17 @@ endif
 
 CMAKE_SOURCE_DIR:=.
 
+ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
+else
+  cmake_tool=$(shell which $(1))
+endif
+
 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
+ CMAKE_C_COMPILER:=$(call cmake_tool,$(TARGET_CC))
+ CMAKE_CXX_COMPILER:=$(call cmake_tool,$(TARGET_CXX))
+ CMAKE_C_COMPILER_ARG1:=
+ CMAKE_CXX_COMPILER_ARG1:=
 else
   CCACHE:=$(shell which ccache)
   ifeq ($(CCACHE),)
@@ -28,6 +27,8 @@ else
   CMAKE_CXX_COMPILER:=$(CCACHE)
   CMAKE_CXX_COMPILER_ARG1:=$(TARGET_CXX_NOCACHE)
 endif
+CMAKE_AR:=$(call cmake_tool,$(TARGET_CROSS)ar)
+CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_CROSS)ranlib)
 
 define Build/Configure/Default
 	(cd $(PKG_BUILD_DIR); \
@@ -48,6 +49,8 @@ define Build/Configure/Default
 			-DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
 			-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
 			-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
+			-DCMAKE_AR="$(CMAKE_AR)" \
+			-DCMAKE_RANLIB="$(CMAKE_RANLIB)" \
 			-DCMAKE_FIND_ROOT_PATH="$(STAGING_DIR);$(TOOLCHAIN_DIR)" \
 			-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \
 			-DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
@@ -55,7 +58,7 @@ define Build/Configure/Default
 			-DCMAKE_STRIP=: \
 			-DCMAKE_INSTALL_PREFIX=/usr \
 			-DDL_LIBRARY=$(STAGING_DIR) \
-                        -DCMAKE_PREFIX_PATH=$(STAGING_DIR) \
+			-DCMAKE_PREFIX_PATH=$(STAGING_DIR) \
 			$(CMAKE_OPTIONS) \
 		$(CMAKE_SOURCE_DIR) \
 	)