From: simonmar <unknown>
Date: Wed, 23 Jul 2003 16:19:48 +0000 (+0000)
Subject: [project @ 2003-07-23 16:19:48 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~646
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5b7cf08b9536041724146221aaf8e04236e57cb4;p=ghc-hetmet.git

[project @ 2003-07-23 16:19:48 by simonmar]
There's no need to pass -u Main_zdmain_closure to the linker, indeed
this causes problems when there isn't a Main_zdmain_closure
(eg. linking a C program using GHC).

merge to STABLE
---

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index 9866b56..b4e8722 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -1054,9 +1054,7 @@ staticLink o_files dep_packages = do
 	 	      ++ pkg_framework_path_opts
 	 	      ++ pkg_framework_opts
 #endif
-	              ++ if static && not no_hs_main then
-			    [ "-u", prefixUnderscore "Main_zdmain_closure"] 
-			 else []))
+		    ))
 
     -- parallel only: move binary to another dir -- HWL
     ways_ <- readIORef v_Ways