From: simonmar <unknown>
Date: Wed, 23 Nov 2005 11:32:53 +0000 (+0000)
Subject: [project @ 2005-11-23 11:32:53 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~30
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a9e1186c4d08a1819f9ef9f2ddee00f2b2c223c6;p=ghc-hetmet.git

[project @ 2005-11-23 11:32:53 by simonmar]
make --mk-dll work with --make

Submitted by: Esa Ilari Vuokko <eivuokko@gmail.com>, thanks!
---

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index 633561a..85099e8 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -330,7 +330,10 @@ link BatchCompile dflags batch_attempt_linking hpt
 				 <+> text "...")
 
 	-- Don't showPass in Batch mode; doLink will do that for us.
-        staticLink dflags obj_files pkg_deps
+	let link = case ghcLink dflags of
+	        MkDLL       -> doMkDLL
+	        StaticLink  -> staticLink
+	link dflags obj_files pkg_deps
 
         debugTraceMsg dflags 3 (text "link: done")
 
diff --git a/ghc/docs/users_guide/flags.xml b/ghc/docs/users_guide/flags.xml
index a6c4d12..8406184 100644
--- a/ghc/docs/users_guide/flags.xml
+++ b/ghc/docs/users_guide/flags.xml
@@ -173,12 +173,6 @@
 	      <entry>mode</entry>
 	      <entry>-</entry>
 	    </row>
-	    <row>
-	      <entry><option>--mk-dll</option></entry>
-	      <entry>DLL-creation mode (Windows only)</entry>
-	      <entry>dynamic</entry>
-	      <entry>-</entry>
-	    </row>
 	  </tbody>
 	</tgroup>
       </informaltable>
@@ -1288,6 +1282,12 @@
 	      <entry>-</entry>
 	    </row>
 	    <row>
+	      <entry><option>--mk-dll</option></entry>
+	      <entry>DLL-creation mode (Windows only)</entry>
+	      <entry>dynamic</entry>
+	      <entry>-</entry>
+	    </row>
+	    <row>
 	      <entry><option>-no-hs-main</option></entry>
 	      <entry>Don't assume this program contains <literal>main</literal></entry>
 	      <entry>dynamic</entry>