Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC
Commits:
-
c2cb2d36
by GHC GitLab CI at 2026-03-11T18:57:08+00:00
1 changed file:
Changes:
| ... | ... | @@ -196,11 +196,13 @@ 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.
|
|
| 199 | + -- Don't depend upon terminfo in early stages or when cross-compiling,
|
|
| 200 | + -- to avoid unnecessary dependencies unless the user provided ncurses
|
|
| 201 | + -- explicitly. For non-cross builds, terminfo is only enabled from
|
|
| 202 | + -- Stage2 onwards (i.e. when building the final compiler).
|
|
| 201 | 203 | -- TODO: Perhaps the user should be able to explicitly enable/disable this.
|
| 202 | 204 | , package haskeline ?
|
| 203 | - builder (Cabal Flags) ? orM [ notM cross, haveCurses ] `cabalFlag` "terminfo"
|
|
| 205 | + builder (Cabal Flags) ? orM [ andM [notM cross, return (stage >= Stage2)], haveCurses ] `cabalFlag` "terminfo"
|
|
| 204 | 206 | |
| 205 | 207 | -------------------------------- terminfo ------------------------------
|
| 206 | 208 | , package terminfo ?
|