Skip to content

Commit

Permalink
Rollup merge of rust-lang#34062 - sanxiyn:no-wget, r=nagisa
Browse files Browse the repository at this point in the history
Unsupport wget

wget support was removed in rust-lang#32942 (search for wget in diff), but configure wasn't updated. wget support was introduced in rust-lang#7498 for Windows, but we now use PowerShell on Windows.
  • Loading branch information
eddyb committed Jun 6, 2016
2 parents f646d93 + a7e96af commit 594990d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 594990d

Please sign in to comment.