X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/a4d094be2ac657698039b16163822b8ccd32f0d9..f3a87e2bd87c0bf884a291948aa8fb998875cb20:/include/prereq-build.mk?ds=sidebyside diff --git a/include/prereq-build.mk b/include/prereq-build.mk index 9b77a1baf..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, \ @@ -119,14 +115,6 @@ $(eval $(call Require,gnutar, \ Please install GNU tar. \ )) -define Require/git - which git-clone -endef - -$(eval $(call Require,git, \ - Please install git. \ -)) - $(eval $(call RequireCommand,svn, \ Please install the subversion client. \ )) @@ -135,3 +123,10 @@ $(eval $(call RequireCommand,autoconf, \ Please install GNU autoconf. \ )) +define Require/gnu-find + $(FIND) $(TMP_DIR) -lname foo +endef + +$(eval $(call Require,gnu-find, \ + Please install GNU find \ +))