build: fix CMake assembly builds with ccache

[openwrt.git] / include / cmake.mk

diff --git a/include/cmake.mk b/include/cmake.mk
index 23ac56c..49fba26 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -27,8 +27,11 @@ 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))
+
+CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR);$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT))
 
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR); \
@@ -46,19 +49,23 @@ 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_ASM_COMPILER="$(CMAKE_C_COMPILER)" \
+                       -DCMAKE_ASM_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
                        -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_NM="$(CMAKE_NM)" \
                        -DCMAKE_RANLIB="$(CMAKE_RANLIB)" \
-                       -DCMAKE_FIND_ROOT_PATH="$(STAGING_DIR);$(TOOLCHAIN_DIR)" \
+                       -DCMAKE_FIND_ROOT_PATH="$(CMAKE_FIND_ROOT_PATH)" \
                        -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) \
-                        -DCMAKE_PREFIX_PATH=$(STAGING_DIR) \
+                       -DCMAKE_PREFIX_PATH=$(STAGING_DIR) \
+                       -DCMAKE_SKIP_RPATH=TRUE  \
                        $(CMAKE_OPTIONS) \
                $(CMAKE_SOURCE_DIR) \
        )