summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-03-02 17:40:40 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-03-02 17:40:40 -0400
commit191e80050f4d314061d4d585a65f9aacb41f5b61 (patch)
tree3546481465cf12453075564e1eb277dc2d89704e /Build
parent3aaee3c7027b0208d7feb1d123d3b48f961796ab (diff)
Linux standalone builds put the bundled ssh last in PATH, so any system ssh will be preferred over it.
This commit was sponsored by Denis Dzyubenko on Patreon.
Diffstat (limited to 'Build')
-rw-r--r--Build/BundledPrograms.hs19
1 files changed, 10 insertions, 9 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index a9a29b603..271e1dd98 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -32,6 +32,16 @@ extraBundledPrograms = catMaybes
#else
[
#endif
+#ifndef darwin_HOST_OS
+#ifndef mingw32_HOST_OS
+ -- OS X has ssh installed by default.
+ -- On Windows, git provides ssh.
+ -- Linux probably has ssh installed system wide,
+ -- and if so the user probably wants to use that one.
+ , Just "ssh"
+ , Just "ssh-keygen"
+#endif
+#endif
]
{- Programs that should be preferred for use from the bundle, over
@@ -57,15 +67,6 @@ preferredBundledPrograms = catMaybes
, Just "xargs"
#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, git provides ssh.
- , Just "ssh"
- , Just "ssh-keygen"
-#endif
-#endif
#ifndef mingw32_HOST_OS
, Just "sh"
#endif