X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Setup.hs;h=aedd52b323397cad31c7092e8546cfb9365f3d2a;hb=a2f811942f782158671fd6dbba94daf5d8ecb0e1;hp=d6836e43939555e3da3d9ebde7e3fb38da7c728b;hpb=cf62d712253bb8999f691b0bf3846f514c6aa2fd;p=ghc-prim.git

diff --git a/Setup.hs b/Setup.hs
index d6836e4..aedd52b 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -16,17 +16,38 @@ import System.Directory
 import Control.Exception (try)
 
 main :: IO ()
-main = do let hooks = defaultUserHooks {
+main = do let hooks = simpleUserHooks {
+                  regHook = addPrimModule
+                          $ regHook simpleUserHooks,
                   buildHook = build_primitive_sources
-                            $ buildHook defaultUserHooks,
+                            $ buildHook simpleUserHooks,
                   makefileHook = build_primitive_sources
-                               $ makefileHook defaultUserHooks,
+                               $ makefileHook simpleUserHooks,
                   haddockHook = build_primitive_sources
-                               $ haddockHook defaultUserHooks }
+                               $ haddockHook simpleUserHooks }
           defaultMainWithHooks hooks
 
 type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
 
+addPrimModule :: Hook a -> Hook a
+addPrimModule f pd lbi uhs x =
+    do let -- I'm not sure which one of these we actually need to change.
+           -- It seems bad that there are two.
+           pd' = addPrimModuleToPD pd
+           lpd = addPrimModuleToPD (localPkgDescr lbi)
+           lbi' = lbi { localPkgDescr = lpd }
+       f pd' lbi' uhs x
+
+addPrimModuleToPD :: PackageDescription -> PackageDescription
+addPrimModuleToPD pd =
+    case library pd of
+    Just lib ->
+        let ems = "GHC.Prim" : exposedModules lib
+            lib' = lib { exposedModules = ems }
+        in pd { library = Just lib' }
+    Nothing ->
+        error "Expected a library, but none found"
+
 build_primitive_sources :: Hook a -> Hook a
 build_primitive_sources f pd lbi uhs x
  = do when (compilerFlavor (compiler lbi) == GHC) $ do