diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-09-24 13:46:10 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-09-24 13:46:10 +0000 |
| commit | 403a4bfc19147dc962180adb099e5ec9d7ad81c1 (patch) | |
| tree | 7ff165d70f1159e5b3757513ff7efdfd71f3433c | |
| parent | 378a8b9481dc2d10be1e6611192e45f3be8201be (diff) | |
| download | upstream-403a4bfc19147dc962180adb099e5ec9d7ad81c1.tar.gz upstream-403a4bfc19147dc962180adb099e5ec9d7ad81c1.tar.bz2 upstream-403a4bfc19147dc962180adb099e5ec9d7ad81c1.zip | |
clean up and really fix bogus build_ directory
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4854 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | include/prereq-build.mk | 1 |
2 files changed, 4 insertions, 1 deletions
@@ -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 11403c2fdc..a2e5469fa6 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 |