on master help sign in
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

commit3769dd41ca3efed29f157b3e62d794df4be5e500 authorShayne Fletcher <shayne.fletcher@digitalasset.com> dateSat 1 Jun 2019, 06:48 (7 years ago) parente370589
1 file changed+36−18
src/Development/IDE/UtilGHC.hs+36−18
src/Development/IDE/UtilGHC.hs+36−18
@@ -22,10 +22,13 @@ import Fingerprint
2222import GHC
2323import GhcMonad
2424import GhcPlugins
25−import Platform
2625import Data.IORef
2726import Control.Exception
2827import FileCleanup
28+import Platform
29+#ifndef GHC_STABLE
30+import ToolSettings
31+#endif
2932
3033----------------------------------------------------------------------
3134-- GHC setup
@@ -62,25 +65,40 @@ runGhcEnv env act = do
6265 cleanTempFiles dflags
6366 cleanTempDirs dflags
6467
65−
66−-- Fake DynFlags which are mostly undefined, but define enough to do a little bit
68+-- Fake DynFlags which are mostly undefined, but define enough to do a
69+-- little bit.
6770fakeDynFlags :: DynFlags
6871fakeDynFlags = defaultDynFlags settings ([], [])
6972 where
7073 settings = Settings
71− {sTargetPlatform = Platform
72− {platformWordSize = 8
73− ,platformOS = OSUnknown
74− ,platformUnregisterised = True
75− }
76− ,sPlatformConstants = PlatformConstants
77− {pc_DYNAMIC_BY_DEFAULT = False
78− ,pc_WORD_SIZE = 8
79− }
80−#ifndef GHC_STABLE
81− ,sIntegerLibraryType = IntegerSimple
74+ { sTargetPlatform = platform
75+ , sPlatformConstants = platformConstants
76+#ifdef GHC_STABLE
77+ , sProgramName = "ghc"
78+ , sProjectVersion = cProjectVersion
79+ , sOpt_P_fingerprint = fingerprint0
80+#else
81+ , sGhcNameVersion = GhcNameVersion
82+ { ghcNameVersion_programName = "ghc"
83+ , ghcNameVersion_projectVersion = cProjectVersion
84+ }
85+ , sFileSettings = FileSettings
86+ { -- fileSettings_tmpDir = "."
87+ }
88+ , sPlatformMisc = PlatformMisc
89+ { platformMisc_integerLibraryType = IntegerSimple
90+ }
91+ , sToolSettings = ToolSettings
92+ { toolSettings_opt_P_fingerprint = fingerprint0
93+ }
8294#endif
83− ,sProjectVersion = cProjectVersion
84− ,sProgramName = "ghc"
85− ,sOpt_P_fingerprint = fingerprint0
86− }
95+ }
96+ platform = Platform
97+ { platformWordSize=8
98+ , platformOS=OSUnknown
99+ , platformUnregisterised=True
100+ }
101+ platformConstants = PlatformConstants
102+ { pc_DYNAMIC_BY_DEFAULT=False
103+ , pc_WORD_SIZE=8
104+ }