X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/270fe35d13f87ccf41feef8642c47a968a480a37..f44890b6fb35c11b7c52c3134cf05d1d3d77d50b:/include/prereq-build.mk

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 7355b9e31..b0114f0b9 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, \
@@ -52,7 +48,8 @@ $(eval $(call Require,working-gcc, \
 
 define Require/working-g++
 	echo 'int main(int argc, char **argv) { return 0; }' | \
-		g++ -x c++ -o $(TMP_DIR)/a.out -lstdc++ -
+		g++ -x c++ -o $(TMP_DIR)/a.out -lstdc++ - && \
+		$(TMP_DIR)/a.out
 endef
 
 $(eval $(call Require,working-g++, \
@@ -118,14 +115,18 @@ $(eval $(call Require,gnutar, \
 	Please install GNU tar. \
 ))
 
+$(eval $(call RequireCommand,svn, \
+	Please install the subversion client. \
+))
+
 $(eval $(call RequireCommand,autoconf, \
 	Please install GNU autoconf. \
 ))
 
-define Require/find
-	find . -maxdepth 1 -exec ls {} + > /dev/null 2>&1
+define Require/gnu-find
+	$(FIND) $(TMP_DIR) -lname foo
 endef
 
-$(eval $(call Require,find, \
-	Please install GNU find 4.2.12 or better. \
+$(eval $(call Require,gnu-find, \
+	Please install GNU find \
 ))