summaryrefslogtreecommitdiff
path: root/Annex/Branch.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-02-27 02:39:22 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-02-27 02:39:22 -0400
commita06989c1aeaf6463e554131993c5cb395d3f08bd (patch)
treea180b379cce80e8d4fa94cd4a15b5052316fddec /Annex/Branch.hs
parent8ba6b0d9bc54656eb0d8d45adf94561f6350e792 (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 'Annex/Branch.hs')
-rw-r--r--Annex/Branch.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs
index 95ac49404..652ba6ff9 100644
--- a/Annex/Branch.hs
+++ b/Annex/Branch.hs
@@ -287,7 +287,7 @@ withIndex' :: Bool -> Annex a -> Annex a
withIndex' bootstrapping a = do
f <- fromRepo gitAnnexIndex
g <- gitRepo
-#ifdef WITH_ANDROID
+#ifdef __ANDROID__
{- Work around for weird getEnvironment breakage on Android. See
- https://github.com/neurocyte/ghc-android/issues/7
- Instead, use getEnv to get some key environment variables that