Make -fext-core a dynamic flag (it was a static flag)

diff --git a/compiler/coreSyn/MkExternalCore.lhs b/compiler/coreSyn/MkExternalCore.lhs
index 0cfb787..fc49c2b 100644 (file)
--- a/compiler/coreSyn/MkExternalCore.lhs
+++ b/compiler/coreSyn/MkExternalCore.lhs
@@ -26,7 +26,6 @@ import Outputable
 import Encoding
 import ForeignCall
 import DynFlags
-import StaticFlags
 import FastString
 
 import IO
@@ -34,7 +33,7 @@ import Data.Char
 
 emitExternalCore :: DynFlags -> CgGuts -> IO ()
 emitExternalCore dflags cg_guts
- | opt_EmitExternalCore 
+ | dopt Opt_EmitExternalCore dflags
  = (do handle <- openFile corename WriteMode
        hPutStrLn handle (show (mkExternalCore cg_guts))      
        hClose handle)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 394965a..e39bff3 100644 (file)
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -309,6 +309,7 @@ data DynFlag
    | Opt_PrintBindContents
    | Opt_GenManifest
    | Opt_EmbedManifest
+   | Opt_EmitExternalCore
 
        -- temporary flags
    | Opt_RunCPS
@@ -1740,6 +1741,7 @@ fFlags = [
     deprecatedForLanguage "IncoherentInstances" ),
   ( "gen-manifest",                     Opt_GenManifest, const Supported ),
   ( "embed-manifest",                   Opt_EmbedManifest, const Supported ),
+  ( "ext-core",                         Opt_EmitExternalCore, const Supported ),
   ( "implicit-import-qualified",        Opt_ImplicitImportQualified, const Supported )
   ]
 

diff --git a/compiler/main/StaticFlagParser.hs b/compiler/main/StaticFlagParser.hs
index ae7b00d..f3d737c 100644 (file)
--- a/compiler/main/StaticFlagParser.hs
+++ b/compiler/main/StaticFlagParser.hs
@@ -167,7 +167,6 @@ isStaticFlag f =
     "static",
     "fhardwire-lib-paths",
     "funregisterised",
-    "fext-core",
     "fcpr-off",
     "ferror-spans",
     "fPIC",

diff --git a/compiler/main/StaticFlags.hs b/compiler/main/StaticFlags.hs
index d3b7cb4..3660d37 100644 (file)
--- a/compiler/main/StaticFlags.hs
+++ b/compiler/main/StaticFlags.hs
@@ -68,7 +68,6 @@ module StaticFlags (
        opt_HistorySize,
        opt_OmitBlackHoling,
        opt_Unregisterised,
-       opt_EmitExternalCore,
        v_Ld_inputs,
        tablesNextToCode,
         opt_StubDeadValues,
@@ -281,9 +280,6 @@ tablesNextToCode :: Bool
 tablesNextToCode               = not opt_Unregisterised
                                  && cGhcEnableTablesNextToCode == "YES"
 
-opt_EmitExternalCore :: Bool
-opt_EmitExternalCore           = lookUp  (fsLit "-fext-core")
-
 -- Include full span info in error messages, instead of just the start position.
 opt_ErrorSpans :: Bool
 opt_ErrorSpans                 = lookUp (fsLit "-ferror-spans")

diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index a914610..bfffb09 100644 (file)
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -2054,7 +2054,7 @@
            <row>
              <entry><option>-fext-core</option></entry>
              <entry>Generate <filename>.hcr</filename> external Core files</entry>
-             <entry>static</entry>
+             <entry>dynamic</entry>
              <entry>-</entry>
            </row>
          </tbody>