diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2019-08-04 04:45:06 +0800 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2019-09-04 13:35:17 +0200 |
| commit | cc7560eb22d2c491a0a995135780f3e8aa3cfa6f (patch) | |
| tree | a58fd4c6ce3fa8a5f5eb3a26425713ed70b034da /include/package.mk | |
| parent | 3f974a954d351bc1f34c39e0ca908a22a2583701 (diff) | |
| download | upstream-cc7560eb22d2c491a0a995135780f3e8aa3cfa6f.tar.gz upstream-cc7560eb22d2c491a0a995135780f3e8aa3cfa6f.tar.bz2 upstream-cc7560eb22d2c491a0a995135780f3e8aa3cfa6f.zip | |
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 <jeffery.to@gmail.com>
(cherry picked from commit e545fac8d968864a965edb9e50c6f90940b0a6c9)
Diffstat (limited to 'include/package.mk')
| -rw-r--r-- | include/package.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/package.mk b/include/package.mk index 66137f211b..c541f6edf7 100644 --- a/include/package.mk +++ b/include/package.mk @@ -11,7 +11,7 @@ all: $(if $(DUMP),dumpinfo,$(if $(CHECK),check,compile)) include $(INCLUDE_DIR)/download.mk -PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) +PKG_BUILD_DIR ?= $(BUILD_DIR)/$(if $(BUILD_VARIANT),$(PKG_NAME)-$(BUILD_VARIANT)/)$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install PKG_BUILD_PARALLEL ?= PKG_USE_MIPS16 ?= 1 |