[project @ 2002-11-07 11:42:48 by simonpj]

[ghc-hetmet.git] / ghc / compiler / main / Main.hs

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 3cb06dd..298107c 100644 (file)
--- a/ghc/compiler/main/Main.hs
+++ b/ghc/compiler/main/Main.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
 
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.107 2002/07/05 16:15:14 sof Exp $
+-- $Id: Main.hs,v 1.114 2002/10/25 16:54:59 simonpj Exp $
 --
 -- GHC Driver program
 --
@@ -19,6 +19,7 @@ module Main (main) where
 
 #ifdef GHCI
 import InteractiveUI
+import DriverPhases( objish_file )
 #endif
 
 
@@ -29,21 +30,20 @@ import Config               ( cBooterVersion, cGhcUnregisterised, cProjectVersion )
 import SysTools                ( getPackageConfigPath, initSysTools, cleanTempFiles )
 import Packages                ( showPackages )
 
-import DriverPipeline  ( doLink, doMkDLL, genPipeline, pipeLoop )
+import DriverPipeline  ( staticLink, doMkDLL, genPipeline, pipeLoop )
 import DriverState     ( buildCoreToDo, buildStgToDo,
-                         findBuildTag, getPackageInfo, unregFlags, 
+                         findBuildTag, getPackageInfo, getPackageConfigMap,
+                         getPackageExtraGhcOpts, unregFlags, 
                          v_GhcMode, v_GhcModeFlag, GhcMode(..),
-                         v_Cmdline_libraries, v_Keep_tmp_files, v_Ld_inputs,
+                         v_Keep_tmp_files, v_Ld_inputs, v_Ways, 
                          v_OptLevel, v_Output_file, v_Output_hi, 
-                         v_Package_details, v_Ways, getPackageExtraGhcOpts,
                          readPackageConf, verifyOutputFiles
                        )
 import DriverFlags     ( buildStaticHscOpts,
                          dynamic_flags, processArgs, static_flags)
 
 import DriverMkDepend  ( beginMkDependHS, endMkDependHS )
-import DriverPhases    ( Phase(HsPp, Hsc), haskellish_src_file, objish_file,
-                         isSourceFile )
+import DriverPhases    ( Phase(HsPp, Hsc), haskellish_src_file, isSourceFile )
 
 import DriverUtil      ( add, handle, handleDyn, later, splitFilename,
                          unknownFlagsErr, getFileSuffix )
@@ -52,34 +52,41 @@ import CmdLineOpts  ( dynFlag, restoreDynFlags,
                          DynFlags(..), HscLang(..), v_Static_hsc_opts,
                          defaultHscLang
                        )
+import BasicTypes      ( failed )
 import Outputable
 import Util
 import Panic           ( GhcException(..), panic )
 
--- Standard Haskell libraries
-import IO
-import Directory       ( doesFileExist )
-import IOExts          ( readIORef, writeIORef )
-import Exception       ( throwDyn, Exception(..), 
+import DATA_IOREF      ( readIORef, writeIORef )
+import EXCEPTION       ( throwDyn, Exception(..), 
                          AsyncException(StackOverflow) )
-import System          ( getArgs, exitWith, ExitCode(..) )
-import Monad
-import List
-import Maybe
 
 #ifndef mingw32_HOST_OS
-import Concurrent      ( myThreadId )
+import CONCURRENT      ( myThreadId )
 # if __GLASGOW_HASKELL__ < 500
-import Exception        ( raiseInThread )
+import EXCEPTION        ( raiseInThread )
 #define throwTo  raiseInThread
 # else
-import Exception       ( throwTo )
+import EXCEPTION       ( throwTo )
 # endif
 
+#if __GLASGOW_HASKELL__ > 504
+import System.Posix.Signals
+#else
 import Posix           ( Handler(Catch), installHandler, sigINT, sigQUIT )
-import Dynamic         ( toDyn )
 #endif
 
+import DYNAMIC         ( toDyn )
+#endif
+
+-- Standard Haskell libraries
+import IO
+import Directory       ( doesFileExist )
+import System          ( getArgs, exitWith, ExitCode(..) )
+import Monad
+import List
+import Maybe
+
 -----------------------------------------------------------------------------
 -- ToDo:
 
@@ -233,7 +240,7 @@ main =
    when (verb >= 2) 
        (hPutStrLn stderr ("Using package config file: " ++ conf_file))
 
-   pkg_details <- readIORef v_Package_details
+   pkg_details <- getPackageConfigMap
    showPackages pkg_details
 
    when (verb >= 3) 
@@ -264,7 +271,7 @@ main =
        then throwDyn (UsageError "can't apply -o to multiple source files")
        else do
 
-   if null real_srcs then throwDyn (UsageError "no input files") else do
+   if null srcs then throwDyn (UsageError "no input files") else do
 
    let compileFile src = do
          restoreDynFlags
@@ -298,24 +305,28 @@ main =
    o_files <- mapM compileFile srcs
 
    when (mode == DoMkDependHS) endMkDependHS
-   when (mode == DoLink) (doLink o_files)
+   when (mode == DoLink) (staticLink o_files)
    when (mode == DoMkDLL) (doMkDLL o_files)
 
 
 
 beginMake :: [String] -> IO ()
-beginMake fileish_args
-  = do let (objs, mods) = partition objish_file fileish_args
-       mapM_ (add v_Ld_inputs) objs
-
-       case mods of
-        []    -> throwDyn (UsageError "no input files")
-        _     -> do dflags <- getDynFlags 
-                    state <- cmInit Batch
-                    graph <- cmDepAnal state dflags mods
-                    (_, ok, _) <- cmLoadModules state dflags graph
-                    when (not ok) (exitWith (ExitFailure 1))
-                    return ()
+beginMake fileish_args  = do 
+  -- anything that doesn't look like a Haskell source filename or
+  -- a module name is passed straight through to the linker
+  let (inputs, objects) = partition looks_like_an_input fileish_args
+  mapM_ (add v_Ld_inputs) objects
+  
+  case inputs of
+       []    -> throwDyn (UsageError "no input files")
+       _     -> do dflags <- getDynFlags 
+                   state <- cmInit Batch
+                   graph <- cmDepAnal state dflags inputs
+                   (_, ok_flag, _) <- cmLoadModules state dflags graph
+                   when (failed ok_flag) (exitWith (ExitFailure 1))
+                   return ()
+  where
+    looks_like_an_input m = haskellish_src_file m || '.' `notElem` m
 
 
 beginInteractive :: [String] -> IO ()
@@ -323,13 +334,11 @@ beginInteractive :: [String] -> IO ()
 beginInteractive = throwDyn (CmdLineError "not built for interactive use")
 #else
 beginInteractive fileish_args
-  = do minus_ls <- readIORef v_Cmdline_libraries
+  = do state <- cmInit Interactive
 
        let (objs, mods) = partition objish_file fileish_args
-          libs = map Object objs ++ map DLL minus_ls
 
-       state <- cmInit Interactive
-       interactiveUI state mods libs
+       interactiveUI state mods objs
 #endif
 
 checkOptions :: [String] -> IO ()