X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=7da0074e2c7536b24455c740cb388426620ef6ad;hb=3a223cd2811d46295048b3a2dab11403ca291b20;hp=9250df03d0831b120db67a6605bd428ae889f25d;hpb=70b6c54b3c140d96b69287f8f400f88a0b7e9c18;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 9250df0..7da0074 100644
--- 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.124 2003/06/04 15:47:59 simonmar Exp $
+-- $Id: Main.hs,v 1.131 2003/07/21 15:14:18 ross Exp $
 --
 -- GHC Driver program
 --
@@ -25,7 +25,8 @@ import InteractiveUI( ghciWelcomeMsg, interactiveUI )
 import CompManager	( cmInit, cmLoadModules, cmDepAnal )
 import HscTypes		( GhciMode(..) )
 import Config		( cBooterVersion, cGhcUnregisterised, cProjectVersion )
-import SysTools		( getPackageConfigPath, initSysTools, cleanTempFiles )
+import SysTools		( getPackageConfigPath, initSysTools, cleanTempFiles,
+			  normalisePath )
 import Packages		( showPackages, getPackageConfigMap, basePackage,
 			  haskell98Package
 			)
@@ -96,7 +97,7 @@ main =
   	   hFlush stdout
 	   case exception of
 		-- an IO exception probably isn't our fault, so don't panic
-		IOException _ ->  hPutStr stderr (show exception)
+		IOException _ ->  hPutStrLn stderr (show exception)
 		AsyncException StackOverflow ->
 			hPutStrLn stderr "stack overflow: use +RTS -K<size> \ 
 					 \to increase it"
@@ -159,7 +160,7 @@ main =
    extra_non_static <- processArgs static_flags 
 			   (unreg_opts ++ way_opts ++ pkg_extra_opts) []
 
-	-- give the static flags to hsc
+	-- Give the static flags to hsc
    static_opts <- buildStaticHscOpts
    writeIORef v_Static_hsc_opts static_opts
 
@@ -218,7 +219,11 @@ main =
 			  || looksLikeModuleName m
 			  || '.' `notElem` m
 
-    (srcs, objs) = partition looks_like_an_input fileish_args
+     -- To simplify the handling of filepaths, we normalise all filepaths right 
+     -- away - e.g., for win32 platforms, backslashes are converted
+     -- into forward slashes.
+    normal_fileish_paths = map normalisePath fileish_args
+    (srcs, objs)         = partition looks_like_an_input normal_fileish_paths
 
    mapM_ (add v_Ld_inputs) objs
 
@@ -228,6 +233,12 @@ main =
 	---------------- Final sanity checking -----------
    checkOptions mode srcs objs
 
+    -- We always link in the base package in
+    -- one-shot linking.  Any other packages
+    -- required must be given using -package
+    -- options on the command-line.
+   let def_hs_pkgs = [basePackage, haskell98Package]
+
 	---------------- Do the business -----------
    case mode of
 	DoMake 	       -> doMake srcs
@@ -237,16 +248,11 @@ main =
 			       endMkDependHS }
 	StopBefore p   -> do { compileFiles mode srcs; return () }
 	DoMkDLL	       -> do { o_files <- compileFiles mode srcs; 
-			       doMkDLL o_files }
+			       doMkDLL o_files def_hs_pkgs }
 	DoLink	       -> do { o_files <- compileFiles mode srcs; 
 			       omit_linking <- readIORef v_NoLink;
 			       when (not omit_linking)
-				    (staticLink o_files 
-					[basePackage, haskell98Package]) }
-			-- We always link in the base package in
-			-- one-shot linking.  Any other packages
-			-- required must be given using -package
-			-- options on the command-line.
+				    (staticLink o_files def_hs_pkgs) }
 
 #ifndef GHCI
 	DoInteractive -> throwDyn (CmdLineError "not built for interactive use")
@@ -260,6 +266,10 @@ main =
 checkOptions :: GhcMode -> [String] -> [String] -> IO ()
      -- Final sanity checking before kicking off a compilation (pipeline).
 checkOptions mode srcs objs = do
+     -- Complain about any unknown flags
+   let unknown_opts = [ f | f@('-':_) <- srcs ]
+   when (notNull unknown_opts) (unknownFlagsErr unknown_opts)
+
 	-- -ohi sanity check
    ohi <- readIORef v_Output_hi
    if (isJust ohi && 
@@ -279,10 +289,6 @@ checkOptions mode srcs objs = do
 	then throwDyn (UsageError "no input files")
 	else do
 
-     -- Complain about any unknown flags
-   let unknown_opts = [ f | f@('-':_) <- srcs ]
-   when (notNull unknown_opts) (unknownFlagsErr unknown_opts)
-
      -- Verify that output files point somewhere sensible.
    verifyOutputFiles
 
@@ -312,7 +318,7 @@ compileFile mode stop_flag src = do
 	  | mode==DoLink || mode==DoMkDLL  = Nothing
 	  | otherwise                      = o_file
 
-   runPipeline mode stop_flag True maybe_o_file src
+   runPipeline mode stop_flag True maybe_o_file src Nothing{-no ModLocation-}
 
 
 -- ----------------------------------------------------------------------------