X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FMain.hs;h=1fcaf02e3d0969df92d688e22181877f63307471;hb=a0928e35b5991b08e01cf8b26128eb54a6eb25ee;hp=1fb9ece5d676606e27fcf696030b2b2410c3dc6d;hpb=9af77fa423926fbda946b31e174173d0ec5ebac8;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs
index 1fb9ece..1fcaf02 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.111 2002/09/13 15:02:35 simonpj Exp $
+-- $Id: Main.hs,v 1.115 2002/12/17 13:50:29 simonmar Exp $
 --
 -- GHC Driver program
 --
@@ -19,6 +19,7 @@ module Main (main) where
 
 #ifdef GHCI
 import InteractiveUI
+import DriverPhases( objish_file )
 #endif
 
 
@@ -36,14 +37,13 @@ import DriverState	( buildCoreToDo, buildStgToDo,
 			  v_GhcMode, v_GhcModeFlag, GhcMode(..),
 			  v_Keep_tmp_files, v_Ld_inputs, v_Ways, 
 			  v_OptLevel, v_Output_file, v_Output_hi, 
-			  readPackageConf, verifyOutputFiles
+			  readPackageConf, verifyOutputFiles, v_NoLink
 			)
 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 )
@@ -304,25 +304,31 @@ main =
 
    o_files <- mapM compileFile srcs
 
+   omit_linking <- readIORef v_NoLink
+
    when (mode == DoMkDependHS) endMkDependHS
-   when (mode == DoLink) (staticLink o_files)
+   when (mode == DoLink && not omit_linking) (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_flag, _) <- cmLoadModules state dflags graph
-		     when (failed ok_flag) (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 ()