diff options
| -rw-r--r-- | include/cmake.mk | 7 | ||||
| -rw-r--r-- | include/package-defaults.mk | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/cmake.mk b/include/cmake.mk index 009c6c2772..fac2bc0227 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -6,7 +6,9 @@ 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) +MAKE_PATH = $(firstword $(CMAKE_BINARY_SUBDIR) .) ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),) cmake_tool=$(TOOLCHAIN_DIR)/bin/$(1) @@ -35,7 +37,8 @@ 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)" \ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 2896b4c783..e371c3bdff 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -136,7 +136,7 @@ MAKE_INSTALL_FLAGS = \ $(MAKE_FLAGS) \ DESTDIR="$(PKG_INSTALL_DIR)" -MAKE_PATH = . +MAKE_PATH ?= . define Build/Compile/Default +$(MAKE_VARS) \ |