From: simonmar <unknown>
Date: Fri, 15 Jun 2001 15:15:33 +0000 (+0000)
Subject: [project @ 2001-06-15 15:15:33 by simonmar]
X-Git-Tag: Approximately_9120_patches~1750
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=8878d049aab3fddf10a20ca0c707f7369ee73b20;p=ghc-hetmet.git

[project @ 2001-06-15 15:15:33 by simonmar]
Restore an #ifdef mingw32_TARGET_OS that shouldn't have been removed
(but do it better this time and don't use an arch-specific #ifdef).
---

diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index 5a02850..345252f 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverPipeline.hs,v 1.79 2001/06/15 08:29:58 simonpj Exp $
+-- $Id: DriverPipeline.hs,v 1.80 2001/06/15 15:15:33 simonmar Exp $
 --
 -- GHC Driver
 --
@@ -799,7 +799,15 @@ doLink o_files = do
 	 	      ++ pkg_lib_opts
 	 	      ++ pkg_extra_ld_opts
 	 	      ++ extra_ld_opts
-	              ++ if static then [ "-u _PrelMain_mainIO_closure" , "-u ___init_PrelMain"] else [])
+	              ++ if static then
+#ifdef LEADING_UNDERSCORE
+			    [ "-u _PrelMain_mainIO_closure" ,
+			      "-u ___init_PrelMain"] 
+#else
+			    [ "-u PrelMain_mainIO_closure" ,
+			      "-u __init_PrelMain"] 
+#endif
+			 else [])
 
     -- parallel only: move binary to another dir -- HWL
     ways_ <- readIORef v_Ways