aboutsummaryrefslogtreecommitdiff
path: root/Build/BundledPrograms.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-10 12:54:58 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-10 12:54:58 -0400
commit9646083316973e935b177aa7c44c220d427e34ce (patch)
tree26ea77322739edc78d6e0b4b1b3d79590e06880f /Build/BundledPrograms.hs
parent18443744061807d7c4cc5692aeadd2e0f94b5706 (diff)
Remove wget from OSX dmg, due to issues with cert paths that broke git-annex automatic upgrading. Instead, curl is used, unless the OSX system has wget installed, which will then be used.
Diffstat (limited to 'Build/BundledPrograms.hs')
-rw-r--r--Build/BundledPrograms.hs5
1 files changed, 5 insertions, 0 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index d1f8cfd4a..dd78994b0 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -45,7 +45,12 @@ bundledPrograms = catMaybes
#endif
, SysConfig.gpg
, ifset SysConfig.curl "curl"
+#ifndef darwin_HOST_OS
+ -- wget on OSX has been problimatic, 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
, ifset SysConfig.bup "bup"
, SysConfig.lsof
, SysConfig.gcrypt