X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Setup.hs;h=d080b2a0952e6b900ae404115a6c40163d5e1d4f;hb=17de35d4d566bd83a6d15ab72dec3d0fe1dfe1dd;hp=eff285911017362ab6b3debc96a2ca0ff75efebd;hpb=5e04a8fa83719d8cd9c9d710fd0dcc8bd24a91cd;p=haskell-directory.git

diff --git a/Setup.hs b/Setup.hs
index eff2859..d080b2a 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -10,25 +10,28 @@ import Control.Monad
 import Data.List
 import Distribution.Simple
 import Distribution.PackageDescription
-import Distribution.PreProcess
 import Distribution.Setup
-import Distribution.Simple.Configure
 import Distribution.Simple.LocalBuildInfo
 import System.Environment
-import System.Exit
+import System.Info
 
 main :: IO ()
 main = do args <- getArgs
           let (ghcArgs, args') = extractGhcArgs args
-              (configureArgs, args'') = extractConfigureArgs args'
+              (confArgs, args'') = extractConfigureArgs args'
               hooks = defaultUserHooks {
                   confHook = add_extra_deps
                            $ confHook defaultUserHooks,
-                  postConf = add_configure_options configureArgs
+                  postConf = add_configure_options confArgs
                            $ postConf defaultUserHooks,
                   buildHook = add_ghc_options ghcArgs
                             $ filter_modules_hook
                             $ buildHook defaultUserHooks,
+                  makefileHook = add_ghc_options ghcArgs
+                               $ filter_modules_hook
+                               $ makefileHook defaultUserHooks,
+                  regHook = add_extra_libs
+                          $ regHook defaultUserHooks,
                   instHook = filter_modules_hook
                            $ instHook defaultUserHooks }
           withArgs args'' $ defaultMainWithHooks hooks
@@ -40,11 +43,11 @@ extractConfigureArgs :: [String] -> ([String], [String])
 extractConfigureArgs = extractPrefixArgs "--configure-option="
 
 extractPrefixArgs :: String -> [String] -> ([String], [String])
-extractPrefixArgs prefix args
+extractPrefixArgs the_prefix args
  = let f [] = ([], [])
        f (x:xs) = case f xs of
                       (wantedArgs, otherArgs) ->
-                          case removePrefix prefix x of
+                          case removePrefix the_prefix x of
                               Just wantedArg ->
                                   (wantedArg:wantedArgs, otherArgs)
                               Nothing ->
@@ -58,16 +61,15 @@ removePrefix (x:xs) (y:ys)
  | x == y = removePrefix xs ys
  | otherwise = Nothing
 
-type Hook a = PackageDescription -> LocalBuildInfo -> Maybe UserHooks -> a
-           -> IO ()
+type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
 type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
 type PostConfHook = Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo
-                 -> IO ExitCode
+                 -> IO ()
 
 -- type PDHook = PackageDescription -> ConfigFlags -> IO ()
 
 add_ghc_options :: [String] -> Hook a -> Hook a
-add_ghc_options args f pd lbi muhs x
+add_ghc_options args f pd lbi uhs x
  = do let lib' = case library pd of
                      Just lib ->
                          let bi = libBuildInfo lib
@@ -76,14 +78,14 @@ add_ghc_options args f pd lbi muhs x
                          in lib { libBuildInfo = bi' }
                      Nothing -> error "Expected a library"
           pd' = pd { library = Just lib' }
-      f pd' lbi muhs x
+      f pd' lbi uhs x
 
 add_configure_options :: [String] -> PostConfHook -> PostConfHook
 add_configure_options args f as cfs pd lbi
  = f (as ++ args) cfs pd lbi
 
 filter_modules_hook :: Hook a -> Hook a
-filter_modules_hook f pd lbi muhs x
+filter_modules_hook f pd lbi uhs x
  = let build_filter = case compilerFlavor $ compiler lbi of
                           GHC -> forGHCBuild
                           _ -> isPortableBuild
@@ -93,7 +95,7 @@ filter_modules_hook f pd lbi muhs x
                       in lib { exposedModules = ems }
                   Nothing -> error "Expected a library"
        pd' = pd { library = Just lib' }
-   in f pd' lbi muhs x
+   in f pd' lbi uhs x
 
 isPortableBuild :: String -> Bool
 isPortableBuild s
@@ -117,3 +119,21 @@ add_extra_deps f pd cf
           _ ->
               return lbi
 
+add_extra_libs :: Hook a -> Hook a
+add_extra_libs f pd lbi uhs x
+ = let pd' = if (os == "mingw32") && (compilerFlavor (compiler lbi) == GHC)
+             then case library pd of
+                  Just lib ->
+                      let lib_bi = libBuildInfo lib
+                          lib_bi' = lib_bi { extraLibs = "wsock32"
+                                                       : "msvcrt"
+                                                       : "kernel32"
+                                                       : "user32"
+                                                       : "shell32"
+                                                       : extraLibs lib_bi }
+                          lib' = lib { libBuildInfo = lib_bi' }
+                      in pd { library = Just lib' }
+                  Nothing -> error "Expected a library"
+             else pd
+   in f pd' lbi uhs x
+