build: use gcc-provided ar, nm and ranlib where appropriate

[openwrt/svn-archive/archive.git] / include / cmake.mk

diff --git a/include/cmake.mk b/include/cmake.mk
index 23ac56c377df1b3246965c42c1239e0da8441b34..6ab628ee2e09d981b55650d13167778aa0849e31 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -27,8 +27,9 @@ 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)
+CMAKE_AR:=$(call cmake_tool,$(TARGET_AR))
+CMAKE_NM:=$(call cmake_tool,$(TARGET_NM))
+CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB))
 
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR); \
@@ -50,6 +51,7 @@ define Build/Configure/Default
                        -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
                        -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \
                        -DCMAKE_AR="$(CMAKE_AR)" \
+                       -DCMAKE_NM="$(CMAKE_NM)" \
                        -DCMAKE_RANLIB="$(CMAKE_RANLIB)" \
                        -DCMAKE_FIND_ROOT_PATH="$(STAGING_DIR);$(TOOLCHAIN_DIR)" \
                        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=BOTH \
@@ -58,7 +60,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) \
        )