projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
toolchain/uClibc: fix upstream patch name on r24029
[oweals/openwrt.git]
/
include
/
host-build.mk
diff --git
a/include/host-build.mk
b/include/host-build.mk
index 8eb49c8f44f6dce754ee321e2869acb8a0b926f5..6f742d28a1a2287e2e8e337619c997a9f0af5a2b 100644
(file)
--- a/
include/host-build.mk
+++ b/
include/host-build.mk
@@
-1,5
+1,5
@@
#
#
-# Copyright (C) 2006-20
09
OpenWrt.org
+# Copyright (C) 2006-20
10
OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@
-7,6
+7,14
@@
HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
HOST_BUILD_DIR ?= $(BUILD_DIR_HOST)/$(PKG_NAME)$(if $(PKG_VERSION),-$(PKG_VERSION))
HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
+HOST_BUILD_PARALLEL ?=
+
+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
include $(INCLUDE_DIR)/host.mk
include $(INCLUDE_DIR)/unpack.mk
@@
-72,7
+80,7
@@
define Host/Configure
endef
define Host/Compile/Default
endef
define Host/Compile/Default
- $(MAKE) -C $(HOST_BUILD_DIR) $(1)
+ $(MAKE)
$(HOST_JOBS)
-C $(HOST_BUILD_DIR) $(1)
endef
define Host/Compile
endef
define Host/Compile
@@
-80,7
+88,7
@@
define Host/Compile
endef
define Host/Install/Default
endef
define Host/Install/Default
- $(MAKE) -C $(HOST_BUILD_DIR) install
+ $(
_SINGLE)$(
MAKE) -C $(HOST_BUILD_DIR) install
endef
define Host/Install
endef
define Host/Install
@@
-130,17
+138,8
@@
ifndef DUMP
touch $$@
$(call Host/Exports,$(HOST_STAMP_BUILT))
touch $$@
$(call Host/Exports,$(HOST_STAMP_BUILT))
- $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
- $(call Host/Compile)
- touch $$@
-
- $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT)
- $(call Host/Install)
- mkdir -p $$(shell dirname $$@)
- touch $$@
-
ifdef Host/Install
ifdef Host/Install
- host-install: $(
HOST_STAMP_INSTALLED
)
+ host-install: $(
if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED)
)
endif
ifndef STAMP_BUILT
endif
ifndef STAMP_BUILT
@@
-149,8
+148,20
@@
ifndef DUMP
install: host-install
clean: host-clean
update: host-update
install: host-install
clean: host-clean
update: host-update
+
+ $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
+ $(call Host/Compile)
+ touch $$@
+
+ $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)
+ $(call Host/Install)
+ mkdir -p $$(shell dirname $$@)
+ touch $$@
else
else
- host-compile: $(HOST_STAMP_INSTALLED)
+ $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE)
+ $(call Host/Compile)
+ $(call Host/Install)
+ touch $$@
endif
host-prepare: $(HOST_STAMP_PREPARED)
host-configure: $(HOST_STAMP_CONFIGURED)
endif
host-prepare: $(HOST_STAMP_PREPARED)
host-configure: $(HOST_STAMP_CONFIGURED)