mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

git for windows includes curl, so avoid bundling it

Browse source
This commit is contained in:
Joey Hess 2015-09-11 14:01:42 -04:00
parent 8fddc7eb8a
commit 5aa5e92da7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Build/BundledPrograms.hs
View file

@ -45,7 +45,6 @@ bundledPrograms = catMaybes
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
, Just "sh" , Just "sh"
#endif #endif
, ifset SysConfig.curl "curl"
#ifndef darwin_HOST_OS #ifndef darwin_HOST_OS
-- wget on OSX has been problimatic, looking for certs in the wrong -- 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 -- places. Don't ship it, use curl or the OSX's own wget if it has
@ -56,6 +55,7 @@ bundledPrograms = catMaybes
, SysConfig.gcrypt , SysConfig.gcrypt
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
-- All these utilities are included in git for Windows -- All these utilities are included in git for Windows
, ifset SysConfig.curl "curl"
, SysConfig.gpg , SysConfig.gpg
, SysConfig.sha1 , SysConfig.sha1
, SysConfig.sha256 , SysConfig.sha256