diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-03-15 18:12:46 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-03-16 19:13:47 +0100 |
| commit | a9c96ef0ac7ac99e4928f5312f3d0d1252c98328 (patch) | |
| tree | 632929bef2d0cdab65ff0c04b8d5802a9a63dda0 | |
| parent | 6bada71e517ca7160360c9ea8a9926c20525f730 (diff) | |
| download | upstream-a9c96ef0ac7ac99e4928f5312f3d0d1252c98328.tar.gz upstream-a9c96ef0ac7ac99e4928f5312f3d0d1252c98328.tar.bz2 upstream-a9c96ef0ac7ac99e4928f5312f3d0d1252c98328.zip | |
build: improve performance by avoiding lazy-eval for make shell calls
Avoids lots of redundant calls to mkhash on things like
package/kernel/linux
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | include/host-build.mk | 2 | ||||
| -rw-r--r-- | include/package.mk | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index c8477e1ddf..adc61d6641 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/unpack.mk include $(INCLUDE_DIR)/depends.mk BUILD_TYPES += host -HOST_STAMP_PREPARED=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))_$(call confvar,CONFIG_AUTOREMOVE $(HOST_PREPARED_DEPENDS))) +HOST_STAMP_PREPARED:=$(HOST_BUILD_DIR)/.prepared$(if $(HOST_QUILT)$(DUMP),,$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))_$(call confvar,CONFIG_AUTOREMOVE $(HOST_PREPARED_DEPENDS))) HOST_STAMP_CONFIGURED:=$(HOST_BUILD_DIR)/.configured HOST_STAMP_BUILT:=$(HOST_BUILD_DIR)/.built HOST_BUILD_PREFIX:=$(if $(IS_PACKAGE_BUILD),$(STAGING_DIR_HOSTPKG),$(STAGING_DIR_HOST)) diff --git a/include/package.mk b/include/package.mk index bf308bb5c0..ff580f5e7c 100644 --- a/include/package.mk +++ b/include/package.mk @@ -56,9 +56,9 @@ ifneq ($(PREV_STAMP_PREPARED),) STAMP_PREPARED:=$(PREV_STAMP_PREPARED) CONFIG_AUTOREBUILD:= else - STAMP_PREPARED=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))_$(call confvar,CONFIG_AUTOREMOVE $(PKG_PREPARED_DEPENDS))) + STAMP_PREPARED:=$(PKG_BUILD_DIR)/.prepared$(if $(QUILT)$(DUMP),,_$(shell $(call find_md5,${CURDIR} $(PKG_FILE_DEPENDS),))_$(call confvar,CONFIG_AUTOREMOVE $(PKG_PREPARED_DEPENDS))) endif -STAMP_CONFIGURED=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) +STAMP_CONFIGURED:=$(PKG_BUILD_DIR)/.configured$(if $(DUMP),,_$(call confvar,$(PKG_CONFIG_DEPENDS))) STAMP_CONFIGURED_WILDCARD=$(PKG_BUILD_DIR)/.configured_* STAMP_BUILT:=$(PKG_BUILD_DIR)/.built STAMP_INSTALLED:=$(STAGING_DIR)/stamp/.$(PKG_DIR_NAME)$(if $(BUILD_VARIANT),.$(BUILD_VARIANT),)_installed |