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 /Utility/SRV.hs | |
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 'Utility/SRV.hs')
-rw-r--r-- | Utility/SRV.hs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Utility/SRV.hs b/Utility/SRV.hs index 9a099089e..b39bf71b2 100644 --- a/Utility/SRV.hs +++ b/Utility/SRV.hs @@ -31,14 +31,12 @@ import Data.Maybe import ADNS.Resolver import Data.Either #else -#ifndef WITH_HOST #ifdef WITH_DNS import qualified Network.DNS.Lookup as DNS import Network.DNS.Resolver import qualified Data.ByteString.UTF8 as B8 #endif #endif -#endif newtype SRV = SRV String deriving (Show, Eq) @@ -64,9 +62,6 @@ lookupSRV (SRV srv) = initResolver [] $ \resolver -> do resolveSRV resolver srv return $ either (\_ -> []) id r #else -#ifdef WITH_HOST -lookupSRV = lookupSRVHost -#else #ifdef WITH_DNS lookupSRV (SRV srv) = do seed <- makeResolvSeed defaultResolvConf @@ -83,7 +78,6 @@ lookupSRV (SRV srv) = do lookupSRV = lookupSRVHost #endif #endif -#endif lookupSRVHost :: SRV -> IO [HostPort] lookupSRVHost (SRV srv) = catchDefaultIO [] $ |