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.

1 files changed, 2 insertions, 2 deletions

diff --git a/Utility/ThreadScheduler.hs b/Utility/ThreadScheduler.hs
index fdf40ab6d..a32606cfd 100644
--- a/Utility/ThreadScheduler.hs
+++ b/Utility/ThreadScheduler.hs
@@ -14,7 +14,7 @@ import Common
 
 import Control.Concurrent
 import System.Posix.Signals
-#ifndef WITH_ANDROID
+#ifndef __ANDROID__
 import System.Posix.Terminal
 #endif
 
@@ -53,7 +53,7 @@ waitForTermination :: IO ()
 waitForTermination = do
 	lock <- newEmptyMVar
 	check softwareTermination lock
-#ifndef WITH_ANDROID
+#ifndef __ANDROID__
 	whenM (queryTerminal stdInput) $
 		check keyboardSignal lock
 #endif