Commit 32fd3547 authored by Ian Lynagh's avatar Ian Lynagh
Browse files

Move and rename opt_HiVersion

It isn't really an option at all
parent d361262b
......@@ -122,7 +122,7 @@ readBinIface_ dflags checkHiWay traceBinIFaceReading hi_path ncu = do
-- Check the interface file version and ways.
check_ver <- get bh
let our_ver = show opt_HiVersion
let our_ver = show hiVersion
wantedGot "Version" our_ver check_ver
errorOnMismatch "mismatched interface file versions" our_ver check_ver
......@@ -172,7 +172,7 @@ writeBinIface dflags hi_path mod_iface = do
else Binary.put_ bh (0 :: Word64)
-- The version and way descriptor go next
put_ bh (show opt_HiVersion)
put_ bh (show hiVersion)
let way_descr = getWayDescr dflags
put_ bh way_descr
......
......@@ -34,6 +34,7 @@ import HscTypes
import BasicTypes hiding (SuccessFlag(..))
import TcRnMonad
import Constants
import PrelNames
import PrelInfo
import MkId ( seqId )
......@@ -50,7 +51,6 @@ import ErrUtils
import Finder
import UniqFM
import SrcLoc
import StaticFlags
import Outputable
import BinIface
import Panic
......@@ -658,7 +658,7 @@ pprModIface iface
<+> (if mi_orphan iface then ptext (sLit "[orphan module]") else empty)
<+> (if mi_finsts iface then ptext (sLit "[family instance module]") else empty)
<+> (if mi_hpc iface then ptext (sLit "[hpc]") else empty)
<+> integer opt_HiVersion
<+> integer hiVersion
, nest 2 (text "interface hash:" <+> ppr (mi_iface_hash iface))
, nest 2 (text "ABI hash:" <+> ppr (mi_mod_hash iface))
, nest 2 (text "export-list hash:" <+> ppr (mi_exp_hash iface))
......
......@@ -13,8 +13,12 @@
module Constants (module Constants) where
import Config
#include "ghc_boot_platform.h"
#include "../includes/HaskellConstants.hs"
hiVersion :: Integer
hiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer
\end{code}
......@@ -77,7 +77,6 @@ module StaticFlags (
-- misc opts
opt_ErrorSpans,
opt_GranMacros,
opt_HiVersion,
opt_HistorySize,
opt_Unregisterised,
v_Ld_inputs,
......@@ -283,9 +282,6 @@ opt_MaxWorkerArgs = lookup_def_int "-fmax-worker-args" (10::Int)
opt_GranMacros :: Bool
opt_GranMacros = lookUp (fsLit "-fgransim")
opt_HiVersion :: Integer
opt_HiVersion = read (cProjectVersionInt ++ cProjectPatchLevel) :: Integer
opt_HistorySize :: Int
opt_HistorySize = lookup_def_int "-fhistory-size" 20
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment