[project @ 2002-12-17 13:50: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 fd84cf0..1fcaf02 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.112 2002/10/15 13:20:18 simonmar 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,8 +304,10 @@ 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)
 
 
@@ -326,7 +328,7 @@ beginMake fileish_args  = do
                    when (failed ok_flag) (exitWith (ExitFailure 1))
                    return ()
   where
-    looks_like_an_input m = haskellish_src_file m || looksLikeModuleName m
+    looks_like_an_input m = haskellish_src_file m || '.' `notElem` m
 
 
 beginInteractive :: [String] -> IO ()