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 /Assistant | |
| 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 'Assistant')
| -rw-r--r-- | Assistant/Pairing.hs | 2 | ||||
| -rw-r--r-- | Assistant/Ssh.hs | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs index 2c1fcf0d0..4736c4396 100644 --- a/Assistant/Pairing.hs +++ b/Assistant/Pairing.hs @@ -75,7 +75,7 @@ data PairingInProgress = PairingInProgress data SomeAddr = IPv4Addr HostAddress {- My Android build of the Network library does not currently have IPV6 - support. -} -#ifndef WITH_ANDROID +#ifndef __ANDROID__ | IPv6Addr HostAddress6 #endif deriving (Ord, Eq, Read, Show) diff --git a/Assistant/Ssh.hs b/Assistant/Ssh.hs index 93d567ce4..4c8d8afbf 100644 --- a/Assistant/Ssh.hs +++ b/Assistant/Ssh.hs @@ -15,9 +15,6 @@ import Git.Remote import Data.Text (Text) import qualified Data.Text as T -import qualified Control.Exception as E -import System.Process (CreateProcess(..)) -import Control.Concurrent import Data.Char data SshData = SshData |