diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-07 15:43:36 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-07 15:53:03 -0400 |
| commit | c60ba579661ed502d361eca0e7ce94c8a6544fc7 (patch) | |
| tree | 4745de66b582314a529f7a7428aa0e41264ac0c5 /Build/BundledPrograms.hs | |
| parent | 118932d39319b467f2b2e8c244cd722bafd19298 (diff) | |
Windows: Remove cygwin ssh, the newer version of which has stopped honoring the setting of HOME. Instead, copy msysgit's ssh into PATH.
Diffstat (limited to 'Build/BundledPrograms.hs')
| -rw-r--r-- | Build/BundledPrograms.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs index 1e826cb10..4ceee3b52 100644 --- a/Build/BundledPrograms.hs +++ b/Build/BundledPrograms.hs @@ -35,13 +35,14 @@ bundledPrograms = catMaybes #endif , Just "rsync" #ifndef darwin_HOST_OS +#ifndef mingw32_HOST_OS -- OS X has ssh installed by default. -- Linux probably has ssh, but not guaranteed. - -- On Windows, msysgit provides ssh, but not in PATH, - -- so we ship our own. + -- On Windows, msysgit provides ssh. , Just "ssh" , Just "ssh-keygen" #endif +#endif #ifndef mingw32_HOST_OS , Just "sh" #endif |