Skip to content

Commit 594990d

Browse files
committed
Rollup merge of rust-lang#34062 - sanxiyn:no-wget, r=nagisa
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.
2 parents f646d93 + a7e96af commit 594990d

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

configure

+4-3
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,13 @@ probe() {
133133
}
134134

135135
probe_need() {
136-
local V=$1
137136
probe $*
137+
local V=$1
138+
shift
138139
eval VV=\$$V
139140
if [ -z "$VV" ]
140141
then
141-
err "needed, but unable to find any of: $*"
142+
err "$V needed, but unable to find any of: $*"
142143
fi
143144
}
144145

@@ -725,7 +726,7 @@ if [ -n "$CFG_ENABLE_ORBIT" ]; then putvar CFG_ENABLE_ORBIT; fi
725726

726727
step_msg "looking for build programs"
727728

728-
probe_need CFG_CURLORWGET curl wget
729+
probe_need CFG_CURL curl
729730
if [ -z "$CFG_PYTHON_PROVIDED" ]; then
730731
probe_need CFG_PYTHON python2.7 python2 python
731732
fi

0 commit comments

Comments
 (0)