about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2016-06-06 06:48:33 +0300
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2016-06-06 06:48:33 +0300
commit594990dbde987b864f2d53bbbccb7941d4e117b2 (patch)
treefd5fa17818bf58ae9f9f056888ea70516991cb47
parentf646d93e424cd835aa0876db4d5cd3da7a5c44d2 (diff)
parenta7e96af37770c60dfca1ebda832bc414324e8067 (diff)
downloadrust-594990dbde987b864f2d53bbbccb7941d4e117b2.tar.gz
rust-594990dbde987b864f2d53bbbccb7941d4e117b2.zip
Rollup merge of #34062 - sanxiyn:no-wget, r=nagisa
Unsupport wget

wget support was removed in #32942 (search for wget in diff), but configure wasn't updated. wget support was introduced in #7498 for Windows, but we now use PowerShell on Windows.
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index b7053c5c54f..a36362e0ada 100755
--- a/configure
+++ b/configure
@@ -133,12 +133,13 @@ probe() {
 }
 
 probe_need() {
-    local V=$1
     probe $*
+    local V=$1
+    shift
     eval VV=\$$V
     if [ -z "$VV" ]
     then
-        err "needed, but unable to find any of: $*"
+        err "$V needed, but unable to find any of: $*"
     fi
 }
 
@@ -725,7 +726,7 @@ if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_ORBIT; fi
 
 step_msg "looking for build programs"
 
-probe_need CFG_CURLORWGET  curl wget
+probe_need CFG_CURL curl
 if [ -z "$CFG_PYTHON_PROVIDED" ]; then
     probe_need CFG_PYTHON      python2.7 python2 python
 fi