Don't import Distribution.Setup in Setup.hs as we no longer need it

[ghc-base.git] / Setup.hs

diff --git a/Setup.hs b/Setup.hs
index c2e1b1d..78e5626 100644 (file)
--- a/Setup.hs
+++ b/Setup.hs
@@ -8,33 +8,25 @@ module Main (main) where
 import Control.Monad
 import Data.List
 import Distribution.PackageDescription
-import Distribution.Setup
 import Distribution.Simple
 import Distribution.Simple.LocalBuildInfo
 import Distribution.Simple.Utils
 import System.Cmd
 import System.FilePath
-import System.Info
 
 main :: IO ()
 main = do let hooks = defaultUserHooks {
-                  confHook = add_extra_deps
-                           $ confHook defaultUserHooks,
                   buildHook = build_primitive_sources
                             $ filter_modules_hook
                             $ buildHook defaultUserHooks,
-                  makefileHook = filter_modules_hook
+                  makefileHook = build_primitive_sources
+                               $ filter_modules_hook
                                $ makefileHook defaultUserHooks,
-                  regHook = add_extra_libs
-                          $ regHook defaultUserHooks,
                   instHook = filter_modules_hook
                            $ instHook defaultUserHooks }
           defaultMainWithHooks hooks
 
 type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
-type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
-
--- type PDHook = PackageDescription -> ConfigFlags -> IO ()
 
 build_primitive_sources :: Hook a -> Hook a
 build_primitive_sources f pd lbi uhs x
@@ -53,53 +45,11 @@ build_primitive_sources f pd lbi uhs x
 
 filter_modules_hook :: Hook a -> Hook a
 filter_modules_hook f pd lbi uhs x
- = let build_filter = case compilerFlavor $ compiler lbi of
-                          GHC -> forGHCBuild
-                          _ -> isPortableBuild
-       lib' = case library pd of
+ = let lib' = case library pd of
                   Just lib ->
-                      let ems = filter build_filter (exposedModules lib)
+                      let ems = filter ("GHC.Prim" /=) (exposedModules lib)
                       in lib { exposedModules = ems }
                   Nothing -> error "Expected a library"
        pd' = pd { library = Just lib' }
    in f pd' lbi uhs x
 
-isPortableBuild :: String -> Bool
-isPortableBuild s
- | "GHC" `isPrefixOf` s = False
- | "Data.Generics" `isPrefixOf` s = False
- | otherwise = s `notElem` ["Foreign.Concurrent", "System.Timeout"]
-
-forGHCBuild :: String -> Bool
-forGHCBuild = ("GHC.Prim" /=)
-
-add_extra_deps :: ConfHook -> ConfHook
-add_extra_deps f pd cf
- = do lbi <- f pd cf
-      case compilerFlavor (compiler lbi) of
-          GHC ->
-              do -- Euch. We should just add the right thing to the lbi
-                 -- ourselves rather than rerunning configure.
-                 let pd' = pd { buildDepends = Dependency "rts" AnyVersion
-                                             : buildDepends pd }
-                 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