summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-12-04 03:00:29 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-12-04 03:00:29 +0000
commit4d761f0cd585654092dc87bc4887d0125f1cbd0b (patch)
tree61694fe42c092b79fad43a38129819bf0b1e6aa2
parent9db76bc2d61bde6d679ca8d4c14f1961061c4dca (diff)
enforce gnu make >= 3.81 now. it has become too annoying to work around bugs in 3.80
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9654 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--include/prereq-build.mk6
1 files changed, 1 insertions, 5 deletions
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 1e448d393..11ee111ce 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -20,11 +20,7 @@ $(eval $(call Require,non-root, \
# Required for the toolchain
define Require/working-make
- echo 'all: test' > $(TMP_DIR)/check.mk
- echo 'e0 = $$$$(foreach s,foobar,$$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk
- echo 'e1 = $$$$(foreach s,foobar, $$$$(eval $$$$s:))' >> $(TMP_DIR)/check.mk
- echo 'test: $$$$(strip $$$$(e0)) $$$$(strip $$$$(e1))' >> $(TMP_DIR)/check.mk
- $(NO_TRACE_MAKE) -f $(TMP_DIR)/check.mk
+ $(MAKE) -v | awk '($$$$1 == "GNU") && ($$$$2 = "Make") && ($$$$3 >= "3.81") { print "ok" }' | grep ok > /dev/null
endef
$(eval $(call Require,working-make, \