[project @ 2001-06-13 15:50:25 by rrt]

[ghc-hetmet.git] / ghc / compiler / main / DriverFlags.hs

diff --git a/ghc/compiler/main/DriverFlags.hs b/ghc/compiler/main/DriverFlags.hs
index 9e7c97b..50692f0 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.54 2001/05/24 15:10:19 dsyme Exp $
+-- $Id: DriverFlags.hs,v 1.57 2001/06/13 15:50:25 rrt Exp $
 --
 -- Driver flags
 --
@@ -22,7 +22,7 @@ module DriverFlags (
 
 import DriverState
 import DriverUtil
-import TmpFiles        ( v_TmpDir, kludgedSystem )
+import TmpFiles        ( v_TmpDir )
 import CmdLineOpts
 import Config
 import Util
@@ -208,6 +208,7 @@ static_flags =
   ,  ( "osuf"          , HasArg (writeIORef v_Object_suf  . Just) )
   ,  ( "hcsuf"         , HasArg (writeIORef v_HC_suf      . Just) )
   ,  ( "hisuf"         , HasArg (writeIORef v_Hi_suf) )
+  ,  ( "hidir"         , HasArg (writeIORef v_Hi_dir . Just) )
   ,  ( "buildtag"      , HasArg (writeIORef v_Build_tag) )
   ,  ( "tmpdir"                , HasArg (writeIORef v_TmpDir . (++ "/")) )
   ,  ( "ohi"           , HasArg (writeIORef v_Output_hi   . Just) )
@@ -542,7 +543,7 @@ runSomething phase_name cmd
    unless n $ do 
 
    -- and run it!
-   exit_code <- kludgedSystem cmd phase_name
+   exit_code <- system cmd
 
    if exit_code /= ExitSuccess
        then throwDyn (PhaseFailed phase_name exit_code)
@@ -585,7 +586,7 @@ machdepCCOpts
        = do n_regs <- dynFlag stolen_x86_regs
             sta    <- readIORef v_Static
             return ( [ if sta then "-DDONT_WANT_WIN32_DLL_SUPPORT" else "",
-                        if suffixMatch "mingw32" cTARGETPLATFORM then "-mno-cygwin -mwin32" else "" ],
+                        if suffixMatch "mingw32" cTARGETPLATFORM then "-mno-cygwin" else "" ],
                      [ "-fno-defer-pop", "-fomit-frame-pointer",
                        "-DSTOLEN_X86_REGS="++show n_regs ]
                    )