From: simonpj <unknown>
Date: Fri, 25 May 2001 12:09:43 +0000 (+0000)
Subject: [project @ 2001-05-25 12:09:43 by simonpj]
X-Git-Tag: Approximately_9120_patches~1871
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=bccf56c2447e5b6dbb352af16378d75b5bef70ad;p=ghc-hetmet.git

[project @ 2001-05-25 12:09:43 by simonpj]
wibble
---

diff --git a/ghc/compiler/main/CmdLineOpts.lhs b/ghc/compiler/main/CmdLineOpts.lhs
index 2cc84b2..972e9bb 100644
--- a/ghc/compiler/main/CmdLineOpts.lhs
+++ b/ghc/compiler/main/CmdLineOpts.lhs
@@ -579,7 +579,7 @@ isStaticHscFlag f =
 	"fno-method-sharing",
         "fno-monomorphism-restriction",
 	"fomit-interface-pragmas",
-	"fkeep-stg-types",
+	"fruntime-types",
 	"fno-pre-inlining",
 	"fdo-eta-reduction",
 	"fdo-lambda-eta-expansion",
diff --git a/ghc/compiler/main/DriverPipeline.hs b/ghc/compiler/main/DriverPipeline.hs
index 22ab424..95c286a 100644
--- a/ghc/compiler/main/DriverPipeline.hs
+++ b/ghc/compiler/main/DriverPipeline.hs
@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------------
--- $Id: DriverPipeline.hs,v 1.69 2001/05/24 15:10:19 dsyme Exp $
+-- $Id: DriverPipeline.hs,v 1.70 2001/05/25 12:09:43 simonpj Exp $
 --
 -- GHC Driver
 --
@@ -974,15 +974,16 @@ compile ghci_mode summary source_unchanged have_object
    dyn_flags <- readIORef v_DynFlags
 
    let hsc_lang = hscLang dyn_flags
+       (basename, _) = splitFilename input_fn
+       
    output_fn <- case hsc_lang of
 		    HscAsm         -> newTempName (phaseInputExt As)
 		    HscC           -> newTempName (phaseInputExt HCc)
         	    HscJava        -> newTempName "java" -- ToDo
-		    HscILX         -> newTempName "ilx"	-- ToDo
+		    HscILX         -> return (basename ++ ".ilx") 	-- newTempName "ilx"	-- ToDo
 		    HscInterpreted -> return (error "no output file")
 
-   let (basename, _) = splitFilename input_fn
-       dyn_flags' = dyn_flags { hscOutName = output_fn,
+   let dyn_flags' = dyn_flags { hscOutName = output_fn,
 				hscStubCOutName = basename ++ "_stub.c",
 				hscStubHOutName = basename ++ "_stub.h" }