From 8878d049aab3fddf10a20ca0c707f7369ee73b20 Mon Sep 17 00:00:00 2001 From: simonmar Date: Fri, 15 Jun 2001 15:15:33 +0000 Subject: [PATCH] [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). --- ghc/compiler/main/DriverPipeline.hs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) 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 -- 1.7.10.4