diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-27 02:39:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-27 02:39:22 -0400 |
| commit | a06989c1aeaf6463e554131993c5cb395d3f08bd (patch) | |
| tree | a180b379cce80e8d4fa94cd4a15b5052316fddec /Command | |
| parent | 8ba6b0d9bc54656eb0d8d45adf94561f6350e792 (diff) | |
Makefile now builds using cabal, taking advantage of cabal's automatic detection of appropriate build flags.
The only thing lost is ./ghci
Speed: make fast used to take 20 seconds here, when rebuilding from
touching Command/Unused.hs. With cabal, it's 29 seconds.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Add.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index 18dc65031..d41a0baea 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -21,7 +21,7 @@ import Annex.Perms import Annex.Link import qualified Annex import qualified Annex.Queue -#ifndef WITH_ANDROID +#ifndef __ANDROID__ import Utility.Touch #endif import Utility.FileMode @@ -166,7 +166,7 @@ link file key hascontent = handle (undo file key) $ do l <- calcGitLink file key makeAnnexLink l file -#ifndef WITH_ANDROID +#ifndef __ANDROID__ when hascontent $ do -- touch the symlink to have the same mtime as the -- file it points to |