diff options
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | Utility/Mounts.hsc | 5 |
2 files changed, 11 insertions, 7 deletions
@@ -251,16 +251,17 @@ androidapp: $(MAKE) android $(MAKE) -C standalone/android -# We bypass cabal, and only run the main ghc --make command for a -# fast development built. -fast: dist/caballog - @$$(grep 'ghc --make' dist/caballog | head -n 1 | sed -e 's/-package-id [^ ]*//g' -e 's/-hide-all-packages//') -O0 -j -dynamic +# Bypass cabal, and only run the main ghc --make command for a +# faster development build. +fast: dist/cabalbuild + @sh dist/cabalbuild @ln -sf dist/build/git-annex/git-annex git-annex @$(MAKE) tags >/dev/null 2>&1 & -dist/caballog: git-annex.cabal +dist/cabalbuild: git-annex.cabal $(BUILDER) configure -f"-Production" -O0 --enable-executable-dynamic - $(BUILDER) build -v2 | tee $@ + $(BUILDER) build -v2 --ghc-options="-O0 -j" | tee dist/caballog + grep 'ghc --make' dist/caballog | tail -n 1 > dist/cabalbuild # Hardcoded command line to make hdevtools start up and work. # You will need some memory. It's worth it. diff --git a/Utility/Mounts.hsc b/Utility/Mounts.hsc index ad4adf334..3f121233a 100644 --- a/Utility/Mounts.hsc +++ b/Utility/Mounts.hsc @@ -1,5 +1,7 @@ {- Interface to mtab (and fstab) - + - Deprecated; moving to mountpoints library on hackage. + - - Derived from hsshellscript, originally written by - Volker Wysk <hsss@volker-wysk.de> - @@ -7,6 +9,7 @@ - Joey Hess <id@joeyh.name> - - Licensed under the GNU LGPL version 2.1 or higher. + - -} {-# LANGUAGE ForeignFunctionInterface #-} @@ -34,7 +37,7 @@ data Mntent = Mntent { mnt_fsname :: String , mnt_dir :: FilePath , mnt_type :: String - } deriving (Read, Show, Eq, Ord) + } deriving (Show, Eq, Ord) #ifndef __ANDROID__ |