summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--include/prereq-build.mk1
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 6df34ac77..88d4ae517 100644
--- a/Makefile
+++ b/Makefile
@@ -91,12 +91,14 @@ toolchain/%: FORCE
.prereq-build: include/prereq-build.mk
@$(NO_TRACE_MAKE) -s -f $(TOPDIR)/include/prereq-build.mk prereq 2>/dev/null || { \
echo "Prerequisite check failed. Use FORCE=1 to override."; \
+ rm -rf $(TOPDIR)/tmp; \
false; \
}
+ @rm -rf $(TOPDIR)/tmp
@touch $@
.prereq-packages: include/prereq.mk .pkginfo .config
- @$(NO_TRACE_MAKE) -s -C package TMPDIR="$(TOPDIR)/tmp" prereq 2>/dev/null || { \
+ @$(NO_TRACE_MAKE) -s -C package prereq 2>/dev/null || { \
echo "Prerequisite check failed. Use FORCE=1 to override."; \
false; \
}
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 11403c2fd..a2e5469fa 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -6,6 +6,7 @@
#
include $(TOPDIR)/rules.mk
+TMP_DIR:=$(TOPDIR)/tmp
include $(INCLUDE_DIR)/prereq.mk
define Require/non-root