Teo Camarasu pushed to branch wip/T24624 at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Core.hs
    ... ... @@ -5,6 +5,7 @@
    5 5
     
    
    6 6
     {-# LANGUAGE NoPolyKinds #-}
    
    7 7
     {-# LANGUAGE LambdaCase #-}
    
    8
    +{-# LANGUAGE TemplateHaskell #-}
    
    8 9
     
    
    9 10
     -- | GHC.Core holds all the main data types for use by for the Glasgow Haskell Compiler midsection
    
    10 11
     module GHC.Core (
    
    ... ... @@ -2704,3 +2705,5 @@ collectNAnnBndrs orig_n e
    2704 2705
         collect 0 bs body               = (reverse bs, body)
    
    2705 2706
         collect n bs (_, AnnLam b body) = collect (n-1) (b:bs) body
    
    2706 2707
         collect _ _  _                  = pprPanic "collectNBinders" $ int orig_n
    
    2708
    +
    
    2709
    +$(pure [])

  • hadrian/src/Settings/Builders/Ghc.hs
    ... ... @@ -56,6 +56,7 @@ compileAndLinkHs = (builder (Ghc CompileHs) ||^ builder (Ghc LinkHs)) ? do
    56 56
                   ]
    
    57 57
                 , commonGhcArgs
    
    58 58
                 , ghcLinkArgs
    
    59
    +            , stage1 ? package compiler ? builder (Ghc CompileHs) ? mconcat [arg "-fexternal-interpreter"]
    
    59 60
                 , defaultGhcWarningsArgs
    
    60 61
                 , builder (Ghc CompileHs) ? arg "-c"
    
    61 62
                 , hieFiles stage ? builder (Ghc CompileHs) ? mconcat