From 699a90bdc195a67c5aa5fca34fcaa07fb2b530ae Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Thu, 17 Oct 2013 16:35:14 -0400
Subject: avoid hsc files on Windows

This used to work, but now hsc2hs is failing with a usage message.
Since I have not changed my windows build environment at all, it must be
some change due to a change in the cabal file. Perhaps too make flags are
causing it to hit a windows command line length limit?

Anyway, these hsc files did nothing on Windows, so can be omitted and not
built to work around yet another epic windows weirdness.
---
 Command/Add.hs | 4 ++++
 Command/Fix.hs | 6 ++++++
 2 files changed, 10 insertions(+)

(limited to 'Command')

diff --git a/Command/Add.hs b/Command/Add.hs
index e0a8269aa..88515d79f 100644
--- a/Command/Add.hs
+++ b/Command/Add.hs
@@ -24,8 +24,10 @@ import Annex.Link
 import qualified Annex
 import qualified Annex.Queue
 #ifndef __ANDROID__
+#ifdef WTTH_CLIBS
 import Utility.Touch
 #endif
+#endif
 import Utility.FileMode
 import Config
 import Utility.InodeCache
@@ -206,11 +208,13 @@ link file key mcache = flip catchAnnex (undo file key) $ do
 	replaceFile file $ makeAnnexLink l
 
 #ifndef __ANDROID__
+#ifdef WITH_CLIBS
 	-- touch symlink to have same time as the original file,
 	-- as provided in the InodeCache
 	case mcache of
 		Just c -> liftIO $ touch file (TimeSpec $ inodeCacheToMtime c) False
 		Nothing -> noop
+#endif
 #endif
 
 	return l
diff --git a/Command/Fix.hs b/Command/Fix.hs
index da2627619..a1e30eafa 100644
--- a/Command/Fix.hs
+++ b/Command/Fix.hs
@@ -15,8 +15,10 @@ import Common.Annex
 import Command
 import qualified Annex.Queue
 #ifndef __ANDROID__
+#ifdef WITH_CLIBS
 import Utility.Touch
 #endif
+#endif
 
 def :: [Command]
 def = [notDirect $ noCommit $ command "fix" paramPaths seek
@@ -37,15 +39,19 @@ perform :: FilePath -> FilePath -> CommandPerform
 perform file link = do
 	liftIO $ do
 #ifndef __ANDROID__
+#ifdef WITH_CLIBS
 		-- preserve mtime of symlink
 		mtime <- catchMaybeIO $ TimeSpec . modificationTime
 			<$> getSymbolicLinkStatus file
+#endif
 #endif
 		createDirectoryIfMissing True (parentDir file)
 		removeFile file
 		createSymbolicLink link file
 #ifndef __ANDROID__
+#ifdef WITH_CLIBS
 		maybe noop (\t -> touch file t False) mtime
+#endif
 #endif
 	next $ cleanup file
 
-- 
cgit v1.2.3