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 7fb1d87..78e5626 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,110 +7,49 @@ module Main (main) where
 
 import Control.Monad
 import Data.List
-import Distribution.Simple
 import Distribution.PackageDescription
-import Distribution.Setup
+import Distribution.Simple
 import Distribution.Simple.LocalBuildInfo
-import System.Environment
-import System.Exit
+import Distribution.Simple.Utils
+import System.Cmd
+import System.FilePath
 
 main :: IO ()
-main = do args <- getArgs
-          let (ghcArgs, args') = extractGhcArgs args
-              (confArgs, args'') = extractConfigureArgs args'
-              hooks = defaultUserHooks {
-                  confHook = add_extra_deps
-                           $ confHook defaultUserHooks,
-                  postConf = add_configure_options confArgs
-                           $ postConf defaultUserHooks,
-                  buildHook = add_ghc_options ghcArgs
+main = do let hooks = defaultUserHooks {
+                  buildHook = build_primitive_sources
                             $ filter_modules_hook
                             $ buildHook defaultUserHooks,
+                  makefileHook = build_primitive_sources
+                               $ filter_modules_hook
+                               $ makefileHook defaultUserHooks,
                   instHook = filter_modules_hook
                            $ instHook defaultUserHooks }
-          withArgs args'' $ defaultMainWithHooks hooks
-
-extractGhcArgs :: [String] -> ([String], [String])
-extractGhcArgs = extractPrefixArgs "--ghc-option="
-
-extractConfigureArgs :: [String] -> ([String], [String])
-extractConfigureArgs = extractPrefixArgs "--configure-option="
-
-extractPrefixArgs :: String -> [String] -> ([String], [String])
-extractPrefixArgs the_prefix args
- = let f [] = ([], [])
-       f (x:xs) = case f xs of
-                      (wantedArgs, otherArgs) ->
-                          case removePrefix the_prefix x of
-                              Just wantedArg ->
-                                  (wantedArg:wantedArgs, otherArgs)
-                              Nothing ->
-                                  (wantedArgs, x:otherArgs)
-   in f args
-
-removePrefix :: String -> String -> Maybe String
-removePrefix "" ys = Just ys
-removePrefix _  "" = Nothing
-removePrefix (x:xs) (y:ys)
- | x == y = removePrefix xs ys
- | otherwise = Nothing
-
-type Hook a = PackageDescription -> LocalBuildInfo -> Maybe UserHooks -> a
-           -> IO ()
-type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
-type PostConfHook = Args -> ConfigFlags -> PackageDescription -> LocalBuildInfo
-                 -> IO ExitCode
-
--- 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
-
-add_configure_options :: [String] -> PostConfHook -> PostConfHook
-add_configure_options args f as cfs pd lbi
- = f (as ++ args) cfs pd lbi
+          defaultMainWithHooks hooks
+
+type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
+
+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
- = let build_filter = case compilerFlavor $ compiler lbi of
-                          GHC -> forGHCBuild
-                          _ -> isPortableBuild
-       lib' = case library pd of
+filter_modules_hook f pd lbi uhs x
+ = 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 muhs x
-
-isPortableBuild :: String -> Bool
-isPortableBuild s
- | "GHC" `isPrefixOf` s = False
- | "Data.Generics" `isPrefixOf` s = False
- | otherwise = s `notElem` ["Foreign.Concurrent", "System.Process"]
-
-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
+   in f pd' lbi uhs x