[project @ 2002-07-06 10:14:31 by chak]

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

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 03ab8a5..d4b8095 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.104 2002/04/05 23:24:29 sof Exp $
+-- $Id: Main.hs,v 1.108 2002/07/06 10:14:31 chak Exp $
 --
 -- GHC Driver program
 --
@@ -18,7 +18,7 @@ module Main (main) where
 
 
 #ifdef GHCI
-import InteractiveUI(ghciWelcomeMsg, interactiveUI)
+import InteractiveUI
 #endif
 
 
@@ -42,7 +42,8 @@ import DriverFlags    ( buildStaticHscOpts,
                          dynamic_flags, processArgs, static_flags)
 
 import DriverMkDepend  ( beginMkDependHS, endMkDependHS )
-import DriverPhases    ( Phase(HsPp, Hsc), haskellish_src_file, objish_file )
+import DriverPhases    ( Phase(HsPp, Hsc), haskellish_src_file, objish_file,
+                         isSourceFile )
 
 import DriverUtil      ( add, handle, handleDyn, later, splitFilename,
                          unknownFlagsErr, getFileSuffix )
@@ -257,8 +258,9 @@ main =
    if (mode == DoInteractive) then beginInteractive srcs else do
 
        -- -o sanity checking
+   let real_srcs = filter isSourceFile srcs -- filters out .a and .o that might appear
    o_file <- readIORef v_Output_file
-   if (srcs `lengthExceeds` 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL)
+   if (real_srcs `lengthExceeds` 1 && isJust o_file && mode /= DoLink && mode /= DoMkDLL)
        then throwDyn (UsageError "can't apply -o to multiple source files")
        else do
 
@@ -280,19 +282,15 @@ main =
          let not_hs_file  = not (haskellish_src_file src)
          pp <- if not_hs_file || mode == StopBefore Hsc || mode == StopBefore HsPp
                        then return src_and_suff else do
---             hPutStrLn stderr "before" >> hFlush stderr
                phases <- genPipeline (StopBefore Hsc) stop_flag
                                      False{-not persistent-} defaultHscLang
                                      src_and_suff
---             hPutStrLn stderr "after" >> hFlush stderr
                pipeLoop phases src_and_suff False{-no linking-} False{-no -o flag-}
                        basename suffix
 
          -- rest of compilation
          hsc_lang <- dynFlag hscLang
---       hPutStrLn stderr ("before-1 " ++ show (pp,mode)) >> hFlush stderr
          phases   <- genPipeline mode stop_flag True hsc_lang pp
---       hPutStrLn stderr "after" >> hFlush stderr
          (r,_)    <- pipeLoop phases pp (mode==DoLink || mode==DoMkDLL)
                                      True{-use -o flag-} basename suffix
          return r
@@ -308,7 +306,7 @@ main =
 beginMake :: [String] -> IO ()
 beginMake fileish_args
   = do let (objs, mods) = partition objish_file fileish_args
-       mapM (add v_Ld_inputs) objs
+       mapM_ (add v_Ld_inputs) objs
 
        case mods of
         []    -> throwDyn (UsageError "no input files")
@@ -328,7 +326,7 @@ beginInteractive fileish_args
   = do minus_ls <- readIORef v_Cmdline_libraries
 
        let (objs, mods) = partition objish_file fileish_args
-          libs = map Left objs ++ map Right minus_ls
+          libs = map Object objs ++ map DLL minus_ls
 
        state <- cmInit Interactive
        interactiveUI state mods libs