Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • hadrian/src/Settings/Packages.hs
    ... ... @@ -92,7 +92,7 @@ packageArgs = do
    92 92
                 --    target code, otherwise enable for stage2 since that runs on
    
    93 93
                 --    the target and can use target's own ghci object linker
    
    94 94
                 [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage2]] `cabalFlag` "internal-interpreter"
    
    95
    -            , orM [ notM cross, haveCurses ]  `cabalFlag` "terminfo"
    
    95
    +            , haveCurses `cabalFlag` "terminfo"
    
    96 96
                 , arg "-build-tool-depends"
    
    97 97
                 , staged (buildFlag UseLibzstd) `cabalFlag` "with-libzstd"
    
    98 98
                 -- ROMES: While the boot compiler is not updated wrt -this-unit-id
    
    ... ... @@ -128,7 +128,7 @@ packageArgs = do
    128 128
     
    
    129 129
             -------------------------------- ghcPkg --------------------------------
    
    130 130
             , package ghcPkg ?
    
    131
    -          builder (Cabal Flags) ? orM [ notM cross, haveCurses ] `cabalFlag` "terminfo"
    
    131
    +          builder (Cabal Flags) ? haveCurses `cabalFlag` "terminfo"
    
    132 132
     
    
    133 133
             -------------------------------- ghcBoot ------------------------------
    
    134 134
             , package ghcBoot ?
    
    ... ... @@ -196,11 +196,8 @@ packageArgs = do
    196 196
             -- and executables. This flag disables the latter.
    
    197 197
             , package haskeline ?
    
    198 198
               builder (Cabal Flags) ? arg "-examples"
    
    199
    -        -- Don't depend upon terminfo when cross-compiling to avoid unnecessary
    
    200
    -        -- dependencies unless the user provided ncurses explicitly.
    
    201
    -        -- TODO: Perhaps the user should be able to explicitly enable/disable this.
    
    202 199
             , package haskeline ?
    
    203
    -          builder (Cabal Flags) ? orM [ notM cross, haveCurses ] `cabalFlag` "terminfo"
    
    200
    +          builder (Cabal Flags) ? haveCurses `cabalFlag` "terminfo"
    
    204 201
     
    
    205 202
             -------------------------------- terminfo ------------------------------
    
    206 203
             , package terminfo ?