kernel: bump to 4.4.39

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

diff --git a/include/cmake.mk b/include/cmake.mk
index 009c6c27728e52eec7131952149232bfa7e60168..5f572e9d7475e807ea56713ee2069dc98f5c1f6b 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -6,7 +6,10 @@ ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
   MAKE_FLAGS+=VERBOSE=1
 endif
 
-CMAKE_SOURCE_DIR:=.
+CMAKE_BINARY_DIR = $(PKG_BUILD_DIR)$(if $(CMAKE_BINARY_SUBDIR),/$(CMAKE_BINARY_SUBDIR))
+CMAKE_SOURCE_DIR = $(PKG_BUILD_DIR)
+HOST_CMAKE_SOURCE_DIR = $(HOST_BUILD_DIR)
+MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .)
 
 ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
   cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1)
@@ -35,9 +38,10 @@ CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST)
 CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
 
 define Build/Configure/Default
-       (cd $(PKG_BUILD_DIR); \
+       mkdir -p $(CMAKE_BINARY_DIR)
+       (cd $(CMAKE_BINARY_DIR); \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
-               CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
+               CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS)" \
                LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \
                cmake \
                        -DCMAKE_SYSTEM_NAME=Linux \
@@ -100,6 +104,6 @@ define Host/Configure/Default
                        -DCMAKE_PREFIX_PATH=$(HOST_BUILD_PREFIX) \
                        -DCMAKE_SKIP_RPATH=TRUE  \
                        $(CMAKE_HOST_OPTIONS) \
-               $(CMAKE_SOURCE_DIR) \
+               $(HOST_CMAKE_SOURCE_DIR) \
        )
 endef