[project @ 2004-01-23 13:55:28 by simonmar]

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

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 535cbe4..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 #-}
 
 -----------------------------------------------------------------------------
--- $Id: Main.hs,v 1.134 2003/10/09 11:58:57 simonpj Exp $
+-- $Id: Main.hs,v 1.136 2003/11/01 01:01:18 sof Exp $
 --
 -- GHC Driver program
 --
@@ -44,7 +44,7 @@ import DriverFlags    ( buildStaticHscOpts,
                          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,
@@ -212,7 +212,7 @@ main =
       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
 
@@ -222,7 +222,9 @@ main =
     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