[project @ 2001-01-08 12:31:34 by rrt]

Add -dynamic and make -static always the default.

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 1f608dc..302a180 100644 (file)
--- a/ghc/compiler/main/DriverFlags.hs
+++ b/ghc/compiler/main/DriverFlags.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -#include "hschooks.h" #-}
 
 -----------------------------------------------------------------------------
--- $Id: DriverFlags.hs,v 1.37 2000/12/19 13:06:50 simonmar Exp $
+-- $Id: DriverFlags.hs,v 1.38 2001/01/08 12:31:34 rrt Exp $
 --
 -- Driver flags
 --
@@ -265,6 +265,7 @@ static_flags =
 
        ----- Linker --------------------------------------------------------
   ,  ( "static"        , NoArg (writeIORef v_Static True) )
+  ,  ( "dynamic"        , NoArg (writeIORef v_Static False) )
   ,  ( "rdynamic"       , NoArg (return ()) ) -- ignored for compat w/ gcc
 
        ----- RTS opts ------------------------------------------------------

diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs
index 5723788..99fee2b 100644 (file)
--- a/ghc/compiler/main/DriverState.hs
+++ b/ghc/compiler/main/DriverState.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverState.hs,v 1.20 2000/12/12 14:35:08 simonmar Exp $
+-- $Id: DriverState.hs,v 1.21 2001/01/08 12:31:34 rrt Exp $
 --
 -- Settings for the driver
 --
@@ -125,11 +125,7 @@ GLOBAL_VAR(v_Keep_tmp_files,               False,          Bool)
 -- Misc
 GLOBAL_VAR(v_Scale_sizes_by,           1.0,            Double)
 GLOBAL_VAR(v_Dry_run,                  False,          Bool)
-#if !defined(HAVE_WIN32_DLL_SUPPORT) || defined(DONT_WANT_WIN32_DLL_SUPPORT)
 GLOBAL_VAR(v_Static,                   True,           Bool)
-#else
-GLOBAL_VAR(v_Static,                   False,          Bool)
-#endif
 GLOBAL_VAR(v_NoHsMain,                         False,          Bool)
 GLOBAL_VAR(v_Recomp,                   True,           Bool)
 GLOBAL_VAR(v_Collect_ghc_timing,       False,          Bool)