kernel: update kernel 4.3-rc7 to version 4.3

[openwrt/openwrt.git] / include / cmake.mk

diff --git a/include/cmake.mk b/include/cmake.mk
index 4c4af502cc3889955c5ad69aef78f8f97cf54bb1..4207a4dcee8444ac1472b2b78a068e5ed811c7ae 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -4,28 +4,36 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
   MAKE_FLAGS+=VERBOSE=1
 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),)
     CCACHE:=$(STAGING_DIR_HOST)/bin/ccache
   endif
   CMAKE_C_COMPILER:=$(CCACHE)
-  CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))
+  CMAKE_C_COMPILER_ARG1:=$(TARGET_CC_NOCACHE)
   CMAKE_CXX_COMPILER:=$(CCACHE)
-  CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
+  CMAKE_CXX_COMPILER_ARG1:=$(TARGET_CXX_NOCACHE)
 endif
+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))
+CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR_HOST)
+CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
 
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR); \
@@ -43,18 +51,25 @@ 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_FIND_ROOT_PATH=$(STAGING_DIR) \
+                       -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS) $(CMAKE_SHARED_LDFLAGS)" \
+                       -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS) $(CMAKE_SHARED_LDFLAGS)" \
+                       -DCMAKE_AR="$(CMAKE_AR)" \
+                       -DCMAKE_NM="$(CMAKE_NM)" \
+                       -DCMAKE_RANLIB="$(CMAKE_RANLIB)" \
+                       -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_SKIP_RPATH=TRUE  \
                        $(CMAKE_OPTIONS) \
-               . \
+               $(CMAKE_SOURCE_DIR) \
        )
 endef
 
@@ -64,3 +79,28 @@ define Build/InstallDev/cmake
 endef
 
 Build/InstallDev = $(if $(CMAKE_INSTALL),$(Build/InstallDev/cmake))
+
+define Host/Configure/Default
+       (cd $(HOST_BUILD_DIR); \
+               CFLAGS="$(HOST_CFLAGS)" \
+               CXXFLAGS="$(HOST_CFLAGS)" \
+               LDFLAGS="$(HOST_LDFLAGS)" \
+               cmake \
+                       -DCMAKE_BUILD_TYPE=Release \
+                       -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
+                       -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
+                       -DCMAKE_EXE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+                       -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+                       -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(HOST_LDFLAGS)" \
+                       -DCMAKE_FIND_ROOT_PATH="$(CMAKE_HOST_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=$(STAGING_DIR_HOST) \
+                       -DCMAKE_PREFIX_PATH=$(STAGING_DIR_HOST) \
+                       -DCMAKE_SKIP_RPATH=TRUE  \
+                       $(CMAKE_HOST_OPTIONS) \
+               $(CMAKE_SOURCE_DIR) \
+       )
+endef