Hugs only: avoid dependency cycle

[ghc-base.git] / Setup.hs

diff --git a/Setup.hs b/Setup.hs
index 13502f4..a983953 100644 (file)
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,4 +1,3 @@
-
 {-
 We need to do some ugly hacks here as base mix of portable and
 unportable stuff, as well as home to some GHC magic.
@@ -8,66 +7,53 @@ module Main (main) where
 
 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
 import Distribution.Simple.LocalBuildInfo
-import System.Environment
-import System.Exit
+import Distribution.Simple.Utils
+import System.Cmd
+import System.FilePath
+import System.Info
 
 main :: IO ()
-main = do args <- getArgs
-          let (ghcArgs, args') = extractGhcArgs args
-          let hooks = defaultUserHooks {
+main = do let hooks = defaultUserHooks {
                   confHook = add_extra_deps
                            $ confHook defaultUserHooks,
-                  buildHook = add_ghc_options ghcArgs
+                  buildHook = build_primitive_sources
                             $ filter_modules_hook
                             $ buildHook defaultUserHooks,
+                  makefileHook = build_primitive_sources
+                               $ filter_modules_hook
+                               $ makefileHook defaultUserHooks,
+                  regHook = add_extra_libs
+                          $ regHook defaultUserHooks,
                   instHook = filter_modules_hook
                            $ instHook defaultUserHooks }
-          withArgs args' $ defaultMainWithHooks hooks
-
-extractGhcArgs :: [String] -> ([String], [String])
-extractGhcArgs args
- = let f [] = ([], [])
-       f (x:xs) = case f xs of
-                      (ghcArgs, otherArgs) ->
-                          case removePrefix "--ghc-option=" x of
-                              Just ghcArg ->
-                                  (ghcArg:ghcArgs, otherArgs)
-                              Nothing ->
-                                  (ghcArgs, x:otherArgs)
-   in f args
+          defaultMainWithHooks hooks
 
-removePrefix :: String -> String -> Maybe String
-removePrefix "" ys = Just ys
-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 PDHook = PackageDescription -> ConfigFlags -> IO ()
 
-add_ghc_options :: [String] -> Hook a -> Hook a
-add_ghc_options args f pd lbi muhs x
- = do let lib' = case library pd of
-                     Just lib ->
-                         let bi = libBuildInfo lib
-                             opts = options bi ++ [(GHC, args)]
-                             bi' = bi { options = opts }
-                         in lib { libBuildInfo = bi' }
-                     Nothing -> error "Expected a library"
-          pd' = pd { library = Just lib' }
-      f pd' lbi muhs x
+build_primitive_sources :: Hook a -> Hook a
+build_primitive_sources f pd lbi uhs x
+ = do when (compilerFlavor (compiler lbi) == GHC) $ do
+          let genprimopcode = joinPath ["..", "..", "utils",
+                                        "genprimopcode", "genprimopcode"]
+              primops = joinPath ["..", "..", "compiler", "prelude",
+                                  "primops.txt"]
+              primhs = joinPath ["GHC", "Prim.hs"]
+              primopwrappers = joinPath ["GHC", "PrimopWrappers.hs"]
+          maybeExit $ system (genprimopcode ++ " --make-haskell-source < "
+                           ++ primops ++ " > " ++ primhs)
+          maybeExit $ system (genprimopcode ++ " --make-haskell-wrappers < "
+                           ++ primops ++ " > " ++ primopwrappers)
+      f pd lbi uhs x
 
 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
@@ -77,14 +63,13 @@ 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
  | "GHC" `isPrefixOf` s = False
  | "Data.Generics" `isPrefixOf` s = False
- | otherwise = s `elem` ["Foreign.Concurrent",
-                         "System.Process"]
+ | otherwise = s `notElem` ["Foreign.Concurrent", "System.Timeout"]
 
 forGHCBuild :: String -> Bool
 forGHCBuild = ("GHC.Prim" /=)
@@ -102,3 +87,20 @@ 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