diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-09-23 09:50:01 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-09-23 09:50:01 +0000 |
| commit | ce44bef353e3ce217a6fa54af1256fa23dd9d7a6 (patch) | |
| tree | fb86bbe643f26e4338fbcb9e29e039446bd66a2c /include | |
| parent | c09ce574b4dd981aab263be5d3362db3195c4c90 (diff) | |
| download | upstream-ce44bef353e3ce217a6fa54af1256fa23dd9d7a6.tar.gz upstream-ce44bef353e3ce217a6fa54af1256fa23dd9d7a6.tar.bz2 upstream-ce44bef353e3ce217a6fa54af1256fa23dd9d7a6.zip | |
build: add the + token to any commands that can pass through the jobserver, fixes parallel build on some systems
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33523 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/host-build.mk | 4 | ||||
| -rw-r--r-- | include/package-defaults.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/host-build.mk b/include/host-build.mk index 66795c8e10..60b7b9f916 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -80,7 +80,7 @@ ifneq ($(HOST_OS),Darwin) endif define Host/Configure/Default - (cd $(HOST_BUILD_DIR)/$(3); \ + $(if $(HOST_CONFIGURE_PARALLEL),+)(cd $(HOST_BUILD_DIR)/$(3); \ if [ -x configure ]; then \ $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(HOST_BUILD_DIR)/$(3)/ && \ $(2) \ @@ -97,7 +97,7 @@ define Host/Configure endef define Host/Compile/Default - $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ + +$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \ $(HOST_MAKE_FLAGS) \ $(1) endef diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 37f814da8c..e2ce863166 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -129,7 +129,7 @@ MAKE_INSTALL_FLAGS = \ MAKE_PATH = . define Build/Compile/Default - $(MAKE_VARS) \ + +$(MAKE_VARS) \ $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ $(MAKE_FLAGS) \ $(1); |