Permalink
Browse files

base now uses build-type: Configure

  • Loading branch information...
1 parent 72e4fe7 commit 1f271ef12d3290747d4198d4e3ebf5302e59b397 @igfoo igfoo committed Mar 23, 2008
Showing with 2 additions and 55 deletions.
  1. +1 −54 Setup.hs
  2. +1 −1 base.cabal
View
55 Setup.hs
@@ -1,59 +1,6 @@
-{-
-We need to do some ugly hacks here as base mix of portable and
-unportable stuff, as well as home to some GHC magic.
--}
-
module Main (main) where
-import Control.Monad
-import Data.List
-import Distribution.PackageDescription
import Distribution.Simple
-import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.Utils
-import System.Cmd
-import System.FilePath
-import System.Exit
-import System.Directory
-import Control.Exception (try)
main :: IO ()
-main = do let hooks = defaultUserHooks {
- buildHook = build_primitive_sources
- $ buildHook defaultUserHooks,
- makefileHook = build_primitive_sources
- $ makefileHook defaultUserHooks,
- haddockHook = build_primitive_sources
- $ haddockHook defaultUserHooks }
- 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"]
- primhs_tmp = addExtension primhs "tmp"
- primopwrappers_tmp = addExtension primopwrappers "tmp"
- maybeExit $ system (genprimopcode ++ " --make-haskell-source < "
- ++ primops ++ " > " ++ primhs_tmp)
- maybeUpdateFile primhs_tmp primhs
- maybeExit $ system (genprimopcode ++ " --make-haskell-wrappers < "
- ++ primops ++ " > " ++ primopwrappers_tmp)
- maybeUpdateFile primopwrappers_tmp primopwrappers
- f pd lbi uhs x
-
--- Replace a file only if the new version is different from the old.
--- This prevents make from doing unnecessary work after we run 'setup makefile'
-maybeUpdateFile :: FilePath -> FilePath -> IO ()
-maybeUpdateFile source target = do
- r <- rawSystem "cmp" ["-s" {-quiet-}, source, target]
- case r of
- ExitSuccess -> removeFile source
- ExitFailure _ -> do try (removeFile target); renameFile source target
-
+main = defaultMainWithHooks defaultUserHooks
View
2 base.cabal
@@ -9,7 +9,7 @@ description:
and a large collection of useful libraries ranging from data
structures to parsing combinators and debugging utilities.
cabal-version: >=1.2
-build-type: Custom
+build-type: Configure
extra-tmp-files:
config.log config.status autom4te.cache
include/HsBaseConfig.h

0 comments on commit 1f271ef

Please sign in to comment.