X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fhost-build.mk;h=6f742d28a1a2287e2e8e337619c997a9f0af5a2b;hb=40b2ff698b979c160748ec33a57c0fad74ea3802;hp=4fd6587aec0a2623eb5b60197c00d6d1d427ce8e;hpb=18e0bc4cd5666a559bafc65c41b0c1b1fa211d18;p=openwrt%2Fsvn-archive%2Farchive.git diff --git a/include/host-build.mk b/include/host-build.mk index 4fd6587aec..6f742d28a1 100644 --- a/include/host-build.mk +++ b/include/host-build.mk @@ -8,7 +8,13 @@ HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION)) HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install HOST_BUILD_PARALLEL ?= -HOST_JOBS ?= $(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),$(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS))) + +ifeq ($(strip $(HOST_BUILD_PARALLEL)),0) +HOST_JOBS?=-j1 +else +HOST_JOBS?=$(if $(HOST_BUILD_PARALLEL)$(CONFIG_PKG_DEFAULT_PARALLEL),\ + $(if $(CONFIG_PKG_BUILD_PARALLEL),-j$(CONFIG_PKG_BUILD_JOBS),-j1),-j1) +endif include $(INCLUDE_DIR)/host.mk include $(INCLUDE_DIR)/unpack.mk @@ -147,12 +153,12 @@ ifndef DUMP $(call Host/Compile) touch $$@ - $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) + $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE) $(call Host/Install) mkdir -p $$(shell dirname $$@) touch $$@ else - $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) + $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE) $(call Host/Compile) $(call Host/Install) touch $$@