X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c3d411344787911d91b7fed556a5fe99eff24ebc..78217eb87a9a15742e6d0bd4cc3ee270f306bfb9:/include/prereq-build.mk

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index d3aec6439..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, \
@@ -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,6 +115,11 @@ $(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. \
 ))
+