From: Felix Fietkau Date: Wed, 22 Oct 2014 10:47:26 +0000 (+0000) Subject: Revert "build: use ONESHELL to speed up scanning and the toplevel makefile" X-Git-Tag: reboot~5550 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=commitdiff_plain;h=4fde9deed11f56b65f389c7e83c70b7b5878222e Revert "build: use ONESHELL to speed up scanning and the toplevel makefile" This seems to cause issues on some build hosts, and it is not that important. SVN-Revision: 43025 --- diff --git a/Makefile b/Makefile index f75fc7fda4..91b6946ac3 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,6 @@ empty:= space:= $(empty) $(empty) $(if $(findstring $(space),$(TOPDIR)),$(error ERROR: The path to the OpenWrt directory must not include any spaces)) -.ONESHELL: world: include $(TOPDIR)/include/host.mk diff --git a/include/scan.mk b/include/scan.mk index 2f2753f2a0..0998333439 100644 --- a/include/scan.mk +++ b/include/scan.mk @@ -78,4 +78,3 @@ $(TMP_DIR)/.$(SCAN_TARGET): $(TARGET_STAMP) $(SCAN_STAMP) FORCE: .PHONY: FORCE .NOTPARALLEL: -.ONESHELL: diff --git a/include/target.mk b/include/target.mk index 657109e75d..3401f849a5 100644 --- a/include/target.mk +++ b/include/target.mk @@ -19,7 +19,6 @@ DEFAULT_PACKAGES.bootloader:= ifneq ($(DUMP),) all: dumpinfo - .ONESHELL: endif target_conf=$(subst .,_,$(subst -,_,$(subst /,_,$(1))))