From e545fac8d968864a965edb9e50c6f90940b0a6c9 Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Sun, 4 Aug 2019 04:45:06 +0800 Subject: build: include BUILD_VARIANT in PKG_BUILD_DIR This changes the default PKG_BUILD_DIR to take BUILD_VARIANT into account (if set), so that packages do not need to manually override PKG_BUILD_DIR just to handle variants. This also updates most base packages with variants to use the updated default PKG_BUILD_DIR. Signed-off-by: Jeffery To --- include/kernel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/kernel.mk') diff --git a/include/kernel.mk b/include/kernel.mk index 975cf455c4..97d23661c9 100644 --- a/include/kernel.mk +++ b/include/kernel.mk @@ -77,7 +77,7 @@ else TARGET_MODULES_DIR:=$(LINUX_TARGET_DIR)/$(MODULES_SUBDIR) ifneq ($(TARGET_BUILD),1) - PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) + PKG_BUILD_DIR ?= $(KERNEL_BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) endif endif -- cgit v1.2.3