X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FDriverMkDepend.hs;h=ffb89c15d96294d11fe899061ca81b9792b832e3;hb=28a5c73a83e8f27c31cad02da07c81e4e6764303;hp=cb8f57a51a7e3bc8fdf1e5a2b5df4aa33819ee14;hpb=aa37e329f5027ef04fe0153b51a7bfff20b1f101;p=ghc-hetmet.git

diff --git a/compiler/main/DriverMkDepend.hs b/compiler/main/DriverMkDepend.hs
index cb8f57a..ffb89c1 100644
--- a/compiler/main/DriverMkDepend.hs
+++ b/compiler/main/DriverMkDepend.hs
@@ -1,9 +1,5 @@
-{-# OPTIONS -w #-}
--- The above warning supression flag is a temporary kludge.
--- While working on this module you are encouraged to remove it and fix
--- any warnings in the module. See
---     http://hackage.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#Warnings
--- for details
+{-# OPTIONS -fno-cse #-}
+-- -fno-cse is needed for GLOBAL_VAR's to behave properly
 
 -----------------------------------------------------------------------------
 --
@@ -29,7 +25,6 @@ import qualified SysTools
 import Module
 import Digraph          ( SCC(..) )
 import Finder           ( findImportedModule, FindResult(..) )
-import Util             ( global, consIORef )
 import Outputable
 import Panic
 import SrcLoc
@@ -45,7 +40,7 @@ import System.Exit      ( ExitCode(..), exitWith )
 import System.Directory
 import System.FilePath
 import System.IO
-import SYSTEM_IO_ERROR  ( isEOFError )
+import System.IO.Error  ( isEOFError )
 import Control.Monad    ( when )
 import Data.Maybe       ( isJust )
 
@@ -179,7 +174,7 @@ processDeps :: Session
 --
 -- For {-# SOURCE #-} imports the "hi" will be "hi-boot".
 
-processDeps session excl_mods hdl (CyclicSCC nodes)
+processDeps _ _ _ (CyclicSCC nodes)
   =     -- There shouldn't be any cycles; report them
     throwDyn (ProgramError (showSDoc $ GHC.cyclicModuleErr nodes))
 
@@ -228,12 +223,12 @@ findDependency  :: HscEnv
                 -> IsBootInterface      -- Source import
                 -> Bool                 -- Record dependency on package modules
                 -> IO (Maybe FilePath)  -- Interface file file
-findDependency hsc_env src imp is_boot include_pkg_deps
+findDependency hsc_env _ imp is_boot _include_pkg_deps
   = do  {       -- Find the module; this will be fast because
                 -- we've done it once during downsweep
           r <- findImportedModule hsc_env imp Nothing
         ; case r of
-            Found loc mod
+            Found loc _
                 -- Home package: just depend on the .hi or hi-boot file
                 | isJust (ml_hs_file loc)
                 -> return (Just (addBootSuffix_maybe is_boot (ml_hi_file loc)))
@@ -376,7 +371,7 @@ pprCycle summaries = pp_group (CyclicSCC summaries)
           mod_str = moduleNameString (moduleName (ms_mod summary))
 
     pp_imps :: SDoc -> [Located ModuleName] -> SDoc
-    pp_imps what [] = empty
+    pp_imps _    [] = empty
     pp_imps what lms
         = case [m | L _ m <- lms, m `elem` cycle_mods] of
             [] -> empty
@@ -396,21 +391,29 @@ GLOBAL_VAR(v_Dep_exclude_mods,          [], [ModuleName]);
 GLOBAL_VAR(v_Dep_suffixes,              [], [String]);
 GLOBAL_VAR(v_Dep_warnings,              True, Bool);
 
+depStartMarker, depEndMarker :: String
 depStartMarker = "# DO NOT DELETE: Beginning of Haskell dependencies"
 depEndMarker   = "# DO NOT DELETE: End of Haskell dependencies"
 
 -- for compatibility with the old mkDependHS, we accept options of the form
 -- -optdep-f -optdep.depend, etc.
+dep_opts :: [Flag IO]
 dep_opts =
-   [ (  "s",                    SepArg (consIORef v_Dep_suffixes) )
-   , (  "f",                    SepArg (writeIORef v_Dep_makefile) )
-   , (  "w",                    NoArg (writeIORef v_Dep_warnings False) )
-
-   , (  "-include-prelude",     NoArg (writeIORef v_Dep_include_pkg_deps True) )
-        -- -include-prelude is the old name for -include-pkg-deps, kept around
-        -- for backward compatibility, but undocumented
-
-   , (  "-include-pkg-deps",    NoArg (writeIORef v_Dep_include_pkg_deps True) )
-   , (  "-exclude-module=",     Prefix (consIORef v_Dep_exclude_mods . mkModuleName) )
-   , (  "x",                    Prefix (consIORef v_Dep_exclude_mods . mkModuleName) )
+   [ Flag "s"                 (SepArg (consIORef v_Dep_suffixes))
+          Supported
+   , Flag "f"                 (SepArg (writeIORef v_Dep_makefile))
+          Supported
+   , Flag "w"                 (NoArg (writeIORef v_Dep_warnings False))
+          Supported
+
+   , Flag "-include-prelude"  (NoArg (writeIORef v_Dep_include_pkg_deps True))
+          (Deprecated "Use --include-pkg-deps instead")
+
+   , Flag "-include-pkg-deps" (NoArg (writeIORef v_Dep_include_pkg_deps True))
+          Supported
+   , Flag "-exclude-module="  (Prefix (consIORef v_Dep_exclude_mods . mkModuleName))
+          Supported
+   , Flag "x"                 (Prefix (consIORef v_Dep_exclude_mods . mkModuleName))
+          Supported
    ]
+