diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2014-12-15 17:03:47 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2014-12-15 17:08:58 +0000 |
| commit | 3f87866ad536d1c20fa477aa124fe1267fb36a43 (patch) | |
| tree | 8770d74570997fc5896243ffabe13001d5d83c7e /compiler/ghc.mk | |
| parent | 48222831ae392cb556707b6b290a4dcc2677d97b (diff) | |
| download | haskell-3f87866ad536d1c20fa477aa124fe1267fb36a43.tar.gz | |
Fix dll-split problem with patch 'Make Core Lint check for locally-bound GlobalId'
The trouble was that my changes made a lot more files transitively link with
DynFlags, which is the root module for the revolting Windows dll-split stuff.
Anyway this patch fixes it, in a good way:
- Make GHC/Hooks *not* import DsMonad, because DsMonad imports too
much other stuff (notably tcLookup variants). Really, Hooks depends
only on *types* not *code*.
- To do this I need the DsM type, and the types it depends on,
not to be part of DsMonad. So I moved it to TcRnTypes, which is
where the similar pieces for the TcM and IfM monads live.
- We can then delete DsMonad.hs-boot
- There are a bunch of knock-on change, of no great significance
Diffstat (limited to 'compiler/ghc.mk')
| -rw-r--r-- | compiler/ghc.mk | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/compiler/ghc.mk b/compiler/ghc.mk index a33fde8d3f..97e64ecfd0 100644 --- a/compiler/ghc.mk +++ b/compiler/ghc.mk @@ -473,12 +473,10 @@ compiler_stage2_dll0_MODULES = \ Avail \ Bag \ BasicTypes \ - BinIface \ Binary \ BooleanFormula \ BreakArray \ BufWrite \ - BuildTyCl \ Class \ CmdLineParser \ CmmType \ @@ -489,7 +487,6 @@ compiler_stage2_dll0_MODULES = \ Constants \ CoreArity \ CoreFVs \ - CoreLint \ CoreSubst \ CoreSyn \ CoreTidy \ @@ -501,7 +498,6 @@ compiler_stage2_dll0_MODULES = \ Demand \ Digraph \ DriverPhases \ - DsMonad \ DynFlags \ Encoding \ ErrUtils \ @@ -512,7 +508,6 @@ compiler_stage2_dll0_MODULES = \ FastMutInt \ FastString \ FastTypes \ - Finder \ Fingerprint \ FiniteMap \ ForeignCall \ @@ -532,7 +527,6 @@ compiler_stage2_dll0_MODULES = \ IOEnv \ Id \ IdInfo \ - IfaceEnv \ IfaceSyn \ IfaceType \ InstEnv \ @@ -541,7 +535,6 @@ compiler_stage2_dll0_MODULES = \ Lexer \ ListSetOps \ Literal \ - LoadIface \ Maybes \ MkCore \ MkId \ @@ -564,7 +557,6 @@ compiler_stage2_dll0_MODULES = \ Platform \ PlatformConstants \ PprCore \ - PrelInfo \ PrelNames \ PrelRules \ Pretty \ @@ -576,11 +568,8 @@ compiler_stage2_dll0_MODULES = \ StaticFlags \ StringBuffer \ TcEvidence \ - TcIface \ - TcRnMonad \ TcRnTypes \ TcType \ - TcTypeNats \ TrieMap \ TyCon \ Type \ |