X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FDriverPipeline.hs;h=0721c7238b322bec14595136c5f5ba9ba802c3a4;hb=a0928e35b5991b08e01cf8b26128eb54a6eb25ee;hp=a129357f29094fece4d590d75f70b384ec5b25cd;hpb=b3016a12ae6495234f9521a73ab223ab05aaa766;p=ghc-hetmet.git

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index a129357..0721c72 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -301,8 +301,17 @@ link' Interactive dflags batch_attempt_linking linkables
 
 link' Batch dflags batch_attempt_linking linkables
    | batch_attempt_linking
-   = do when (verb >= 1) $
-             hPutStrLn stderr "ghc: linking ..."
+   = do 
+	-- check for the -no-link flag
+	omit_linking <- readIORef v_NoLink
+	if omit_linking 
+	  then do when (verb >= 3) $
+		    hPutStrLn stderr "link(batch): linking omitted (-no-link flag given)."
+	          return Succeeded
+	  else do
+
+	when (verb >= 1) $
+             hPutStrLn stderr "Linking ..."
 
 	-- Don't showPass in Batch mode; doLink will do that for us.
         staticLink (concatMap getOfiles linkables)