summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-02-23 11:33:07 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-02-23 11:33:07 -0400
commite3b5b0a6c94ebffb8aa66d96dcc386cddd70c623 (patch)
treeca54940dd94d44b3420ed3d65557741a23382d0b /Build
parenteac23f65e6d9c5f5c484ae3184bfaf24bba14822 (diff)
avoid trying to include gpg in bundle on Windows
Diffstat (limited to 'Build')
-rw-r--r--Build/BundledPrograms.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/Build/BundledPrograms.hs b/Build/BundledPrograms.hs
index 74e187618..e21855519 100644
--- a/Build/BundledPrograms.hs
+++ b/Build/BundledPrograms.hs
@@ -26,7 +26,10 @@ extraBundledPrograms :: [FilePath]
extraBundledPrograms = catMaybes
-- The system gpg is probably better, because it may better
-- integrate with the system gpg-agent, etc.
+ -- On Windows, gpg is bundled with git for windows.
+#ifndef mingw32_HOST_OS
[ SysConfig.gpg
+#endif
]
{- Programs that should be preferred for use from the bundle, over