X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fmain%2FStaticFlags.hs;h=67e8ab58e50c7883c90d045b4ad7fa85158d82b6;hb=d2b7119250068ecbf5f085220663687733bde477;hp=06a47b5a653c3d393293a77c78f1e983df93f4fb;hpb=d061166982c65f8e61b4faf942bc5737da2b272c;p=ghc-hetmet.git

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index 06a47b5..67e8ab5 100644
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -30,7 +30,6 @@ module StaticFlags (
 
         -- Hpc opts
 	opt_Hpc,
-        opt_Hpc_Tracer,
 
 	-- language opts
 	opt_DictsStrict,
@@ -61,7 +60,6 @@ module StaticFlags (
 
 	-- misc opts
 	opt_IgnoreDotGhci,
-	opt_ShortGhciBanner,
 	opt_ErrorSpans,
 	opt_GranMacros,
 	opt_HiVersion,
@@ -144,8 +142,6 @@ static_flags = [
 	------- GHCi -------------------------------------------------------
      ( "ignore-dot-ghci", PassFlag addOpt )
   ,  ( "read-dot-ghci"  , NoArg (removeOpt "-ignore-dot-ghci") )
-  ,  ( "short-ghci-banner", PassFlag addOpt )
-  ,  ( "long-ghci-banner" , NoArg (removeOpt "-short-ghci-banner") )
 
 	------- ways --------------------------------------------------------
   ,  ( "prof"		, NoArg (addWay WayProf) )
@@ -276,7 +272,6 @@ unpacked_opts =
 
 
 opt_IgnoreDotGhci		= lookUp FSLIT("-ignore-dot-ghci")
-opt_ShortGhciBanner             = lookUp FSLIT("-short-ghci-banner")
 
 -- debugging opts
 opt_PprStyle_Debug		= lookUp  FSLIT("-dppr-debug")
@@ -289,11 +284,12 @@ opt_AutoSccsOnIndividualCafs	= lookUp  FSLIT("-fauto-sccs-on-individual-cafs")
 opt_SccProfilingOn		= lookUp  FSLIT("-fscc-profiling")
 opt_DoTickyProfiling            = WayTicky `elem` (unsafePerformIO $ readIORef v_Ways)
 
--- Hpc opts
-
+-- Hpc opts, only work in a stage2 build
+#if GHCI
 opt_Hpc				= lookUp FSLIT("-fhpc")  
-				  || opt_Hpc_Tracer 
-opt_Hpc_Tracer			= lookUp FSLIT("-fhpc-tracer")
+#else
+opt_Hpc				= False
+#endif
 
 -- language opts
 opt_DictsStrict			= lookUp  FSLIT("-fdicts-strict")