Ghc lib 0.20190531 (#1486)

* Upgrade to ghc-lib-0.20190531

* Listen up Wally, Remove redundant commented code!

* Argh! WhattamistakeAtomakeA!

* Whitespace to force Azure pipeline to reconsider ignoring this PR

* Repackage ghc-lib, update SHAs and push again

* Refer to a non-existent release as an experiment

* Put the release number back

* Fix build of haskell-ide-core-public
This commit is contained in:
Shayne Fletcher 2019-06-01 06:48:49 -04:00 committed by GitHub
parent e370589e77
commit 3769dd41ca

View File

@ -22,10 +22,13 @@ import Fingerprint
import GHC import GHC
import GhcMonad import GhcMonad
import GhcPlugins import GhcPlugins
import Platform
import Data.IORef import Data.IORef
import Control.Exception import Control.Exception
import FileCleanup import FileCleanup
import Platform
#ifndef GHC_STABLE
import ToolSettings
#endif
---------------------------------------------------------------------- ----------------------------------------------------------------------
-- GHC setup -- GHC setup
@ -62,25 +65,40 @@ runGhcEnv env act = do
cleanTempFiles dflags cleanTempFiles dflags
cleanTempDirs dflags cleanTempDirs dflags
-- Fake DynFlags which are mostly undefined, but define enough to do a
-- Fake DynFlags which are mostly undefined, but define enough to do a little bit -- little bit.
fakeDynFlags :: DynFlags fakeDynFlags :: DynFlags
fakeDynFlags = defaultDynFlags settings ([], []) fakeDynFlags = defaultDynFlags settings ([], [])
where where
settings = Settings settings = Settings
{sTargetPlatform = Platform { sTargetPlatform = platform
{platformWordSize = 8 , sPlatformConstants = platformConstants
,platformOS = OSUnknown #ifdef GHC_STABLE
,platformUnregisterised = True , sProgramName = "ghc"
} , sProjectVersion = cProjectVersion
,sPlatformConstants = PlatformConstants , sOpt_P_fingerprint = fingerprint0
{pc_DYNAMIC_BY_DEFAULT = False #else
,pc_WORD_SIZE = 8 , sGhcNameVersion = GhcNameVersion
} { ghcNameVersion_programName = "ghc"
#ifndef GHC_STABLE , ghcNameVersion_projectVersion = cProjectVersion
,sIntegerLibraryType = IntegerSimple }
, sFileSettings = FileSettings
{ -- fileSettings_tmpDir = "."
}
, sPlatformMisc = PlatformMisc
{ platformMisc_integerLibraryType = IntegerSimple
}
, sToolSettings = ToolSettings
{ toolSettings_opt_P_fingerprint = fingerprint0
}
#endif #endif
,sProjectVersion = cProjectVersion }
,sProgramName = "ghc" platform = Platform
,sOpt_P_fingerprint = fingerprint0 { platformWordSize=8
} , platformOS=OSUnknown
, platformUnregisterised=True
}
platformConstants = PlatformConstants
{ pc_DYNAMIC_BY_DEFAULT=False
, pc_WORD_SIZE=8
}