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.
This commit is contained in:
parent
32aee1bb3e
commit
cbd53b4a8c
18 changed files with 56 additions and 141 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue