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

Commits:

3 changed files:

Changes:

  • hadrian/src/Settings/Packages.hs
    ... ... @@ -128,39 +128,9 @@ packageArgs = do
    128 128
    129 129 
             --------------------------------- ghci ---------------------------------
    130 130 
             , package ghci ? mconcat
    131 
    -          [
    132 
    -          -- The use case here is that we want to build @iserv-proxy@ for the
    133 
    -          -- cross compiler. That one needs to be compiled by the bootstrap
    134 
    -          -- compiler as it needs to run on the host. Hence @iserv@ needs
    135 
    -          -- @GHCi.TH@, @GHCi.Message@, @GHCi.Run@, and @GHCi.Server@ from
    136 
    -          -- @ghci@. And those are behind the @-finternal-interpreter@ flag.
    137 
    -          --
    138 
    -          -- But it may not build if we have made some changes to ghci's
    139 
    -          -- dependencies (see #16051).
    140 
    -          --
    141 
    -          -- To fix this properly Hadrian would need to:
    142 
    -          --   * first build a compiler for the build platform (stage1 is enough)
    143 
    -          --   * use it as a bootstrap compiler to build the stage1 cross-compiler
    144 
    -          --
    145 
    -          -- The issue is that "configure" would have to be executed twice (for
    146 
    -          -- the build platform and for the cross-platform) and Hadrian would
    147 
    -          -- need to be fixed to support two different stage1 compilers.
    148 
    -          --
    149 
    -          -- The workaround we use is to check if the bootstrap compiler has
    150 
    -          -- the same version as the one we are building. In this case we can
    151 
    -          -- avoid the first step above and directly build with
    152 
    -          -- `-finternal-interpreter`.
    153 
    -          --
    154 
    -          -- TODO: Note that in that case we also do not need to build most of
    155 
    -          -- the Stage1 libraries, as we already know that the bootstrap
    156 
    -          -- compiler comes with the same versions as the one we are building.
    157 
    -          --
    158 
    -            builder (Cabal Setup) ? cabalExtraDirs ffiIncludeDir ffiLibraryDir
    131 
    +          [ builder (Cabal Setup) ? cabalExtraDirs ffiIncludeDir ffiLibraryDir
    159 132 
               , builder (Cabal Flags) ? mconcat
    160 
    -            [ ifM stage0
    161 
    -                (andM [cross, bootCross] `cabalFlag` "internal-interpreter")
    162 
    -                (arg "internal-interpreter")
    163 
    -            , stage0 `cabalFlag` "bootstrap"
    133 
    +            [ stage0 `cabalFlag` "bootstrap"
    164 134 
                 ]
    165 135
    166 136 
               ]

  • libraries/ghci/GHCi/Run.hs
    ... ... @@ -260,7 +260,11 @@ sandboxIO opts io = do
    260 260 
     --
    261 261 
     rethrow :: EvalOpts -> IO a -> IO a
    262 262 
     rethrow EvalOpts{..} io =
    263 
    +#if MIN_VERSION_base(4,20,0)
    263 264 
       catchNoPropagate io $ \(ExceptionWithContext cx se) -> do
    265 
    +#else
    266 
    +  catch io $ \se -> do
    267 
    +#endif
    264 268 
         -- If -fbreak-on-error, we break unconditionally,
    265 269 
         --  but with care of not breaking twice
    266 270 
         if breakOnError && not breakOnException
    ... ... @@ -271,7 +275,11 @@ rethrow EvalOpts{..} io =
    271 275 
                    Just UserInterrupt -> return ()
    272 276 
                    -- In any other case, we don't want to break
    273 277 
                    _ -> poke exceptionFlag 0
    278 
    +#if MIN_VERSION_base(4,20,0)
    274 279 
         rethrowIO (ExceptionWithContext cx se)
    280 
    +#else
    281 
    +    throwIO se
    282 
    +#endif
    275 283
    276 284 
     --
    277 285 
     -- While we're waiting for the sandbox thread to return a result, if

  • libraries/ghci/ghci.cabal.in
    ... ... @@ -17,11 +17,6 @@ cabal-version: >=1.10
    17 17 
     build-type:     Simple
    18 18 
     extra-source-files: changelog.md
    19 19
    20 
    -Flag internal-interpreter
    21 
    -    Description: Build with internal interpreter support.
    22 
    -    Default: False
    23 
    -    Manual: True
    24 
    -
    25 20 
     Flag bootstrap
    26 21 
             Description:
    27 22 
               Enabled when building the stage1 compiler in order to vendor the in-tree
    ... ... @@ -56,23 +51,19 @@ library
    56 51 
             TupleSections
    57 52 
             UnboxedTuples
    58 53
    59 
    -    if flag(internal-interpreter)
    60 
    -        CPP-Options: -DHAVE_INTERNAL_INTERPRETER
    54 
    +    if !arch(javascript)
    61 55 
             exposed-modules:
    62 
    -            GHCi.Run
    63 
    -            GHCi.Debugger
    64 
    -            GHCi.CreateBCO
    65 
    -            GHCi.ObjLink
    66 
    -            GHCi.Signals
    67 
    -            GHCi.StaticPtrTable
    68 
    -            GHCi.TH
    69 
    -            GHCi.Server
    70 
    -
    71 
    -        if !arch(javascript)
    72 
    -          exposed-modules:
    73 
    -            GHCi.InfoTable
    56 
    +          GHCi.InfoTable
    74 57
    75 58 
         exposed-modules:
    59 
    +        GHCi.Run
    60 
    +        GHCi.Debugger
    61 
    +        GHCi.CreateBCO
    62 
    +        GHCi.ObjLink
    63 
    +        GHCi.Signals
    64 
    +        GHCi.StaticPtrTable
    65 
    +        GHCi.TH
    66 
    +        GHCi.Server
    76 67 
             GHCi.BreakArray
    77 68 
             GHCi.BinaryArray
    78 69 
             GHCi.Message

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.haskell.org. Manage all notifications · Help