projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2004-01-05 09:35:00 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
1731fa5
..
bbdd8f8
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 #-}
-----------------------------------------------------------------------------
{-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-}
-----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.133 2003/09/23 14:33:00 simonmar Exp $
+-- $Id: Main.hs,v 1.136 2003/11/01 01:01:18 sof Exp $
--
-- GHC Driver program
--
--
-- GHC Driver program
--
@@
-44,7
+44,7
@@
import DriverFlags ( buildStaticHscOpts,
dynamic_flags, processArgs, static_flags)
import DriverMkDepend ( beginMkDependHS, endMkDependHS )
dynamic_flags, processArgs, static_flags)
import DriverMkDepend ( beginMkDependHS, endMkDependHS )
-import DriverPhases ( isSourceFile )
+import DriverPhases ( isSourceFilename )
import DriverUtil ( add, handle, handleDyn, later, unknownFlagsErr )
import CmdLineOpts ( dynFlag, restoreDynFlags,
import DriverUtil ( add, handle, handleDyn, later, unknownFlagsErr )
import CmdLineOpts ( dynFlag, restoreDynFlags,
@@
-212,7
+212,7
@@
main =
Everything else is considered to be a linker object, and passed
straight through to the linker.
-}
Everything else is considered to be a linker object, and passed
straight through to the linker.
-}
- looks_like_an_input m = isSourceFile m
+ looks_like_an_input m = isSourceFilename m
|| looksLikeModuleName m
|| '.' `notElem` m
|| looksLikeModuleName m
|| '.' `notElem` m
@@
-222,7
+222,9
@@
main =
normal_fileish_paths = map normalisePath fileish_args
(srcs, objs) = partition looks_like_an_input normal_fileish_paths
normal_fileish_paths = map normalisePath fileish_args
(srcs, objs) = partition looks_like_an_input normal_fileish_paths
- mapM_ (add v_Ld_inputs) objs
+ -- Note: have v_Ld_inputs maintain the order in which 'objs' occurred on
+ -- the command-line.
+ mapM_ (add v_Ld_inputs) (reverse objs)
---------------- Display banners and configuration -----------
showBanners mode conf_file static_opts
---------------- Display banners and configuration -----------
showBanners mode conf_file static_opts
@@
-332,9
+334,9
@@
doMake :: [String] -> IO ()
doMake [] = throwDyn (UsageError "no input files")
doMake srcs = do
dflags <- getDynFlags
doMake [] = throwDyn (UsageError "no input files")
doMake srcs = do
dflags <- getDynFlags
- state <- cmInit Batch
- graph <- cmDepAnal state dflags srcs
- (_, ok_flag, _) <- cmLoadModules state dflags graph
+ state <- cmInit Batch dflags
+ graph <- cmDepAnal state srcs
+ (_, ok_flag, _) <- cmLoadModules state graph
when (failed ok_flag) (exitWith (ExitFailure 1))
return ()
when (failed ok_flag) (exitWith (ExitFailure 1))
return ()