summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-10-25 13:51:31 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-10-25 13:51:31 -0400
commitc90d07d0dd37e3631bf70bd01e68c7f818215a97 (patch)
treee5fa007012a45d8eda9ddfe9675a92e258975cb3 /Build
parent0cd34920d80b04409b4a182a96b02e28f4ee4ee2 (diff)
Windows: Remove wget from bundle; it needs libraries that are not included, and git for windows includes curl which git-annex will use instead.
wget was broken even in the previous old release of the windows bundle, this is not new breakage. msys-idn-11.dll and probably more would be needed to use it. git for windows includes msys-idn2-0.dll instead.
Diffstat (limited to 'Build')
-rw-r--r--Build/BundledPrograms.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index 271e1dd98..9e590bcf1 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -70,12 +70,14 @@ preferredBundledPrograms = catMaybes
#ifndef mingw32_HOST_OS
, Just "sh"
#endif
+#ifndef mingw32_HOST_OS
#ifndef darwin_HOST_OS
-- wget on OSX has been problematic, looking for certs in the wrong
-- places. Don't ship it, use curl or the OSX's own wget if it has
-- one.
, ifset SysConfig.wget "wget"
#endif
+#endif
, SysConfig.lsof
, SysConfig.gcrypt
#ifndef mingw32_HOST_OS