From e3b5b0a6c94ebffb8aa66d96dcc386cddd70c623 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 23 Feb 2016 11:33:07 -0400 Subject: avoid trying to include gpg in bundle on Windows --- Build/BundledPrograms.hs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Build') 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 -- cgit v1.2.3