Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 9bcfd140 by GHC GitLab CI at 2026-03-12T15:55:53+00:00 Simplify terminfo flag logic - - - - - 1 changed file: - hadrian/src/Settings/Packages.hs Changes: ===================================== hadrian/src/Settings/Packages.hs ===================================== @@ -92,7 +92,7 @@ packageArgs = do -- target code, otherwise enable for stage2 since that runs on -- the target and can use target's own ghci object linker [ andM [expr (ghcWithInterpreter stage), orM [expr (notM cross), stage2]] `cabalFlag` "internal-interpreter" - , orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" + , haveCurses `cabalFlag` "terminfo" , arg "-build-tool-depends" , staged (buildFlag UseLibzstd) `cabalFlag` "with-libzstd" -- ROMES: While the boot compiler is not updated wrt -this-unit-id @@ -128,7 +128,7 @@ packageArgs = do -------------------------------- ghcPkg -------------------------------- , package ghcPkg ? - builder (Cabal Flags) ? orM [ notM cross, haveCurses ] `cabalFlag` "terminfo" + builder (Cabal Flags) ? haveCurses `cabalFlag` "terminfo" -------------------------------- ghcBoot ------------------------------ , package ghcBoot ? @@ -196,13 +196,8 @@ packageArgs = do -- and executables. This flag disables the latter. , package haskeline ? builder (Cabal Flags) ? arg "-examples" - -- Don't depend upon terminfo in early stages or when cross-compiling, - -- to avoid unnecessary dependencies unless the user provided ncurses - -- explicitly. For non-cross builds, terminfo is only enabled from - -- Stage2 onwards (i.e. when building the final compiler). - -- TODO: Perhaps the user should be able to explicitly enable/disable this. , package haskeline ? - builder (Cabal Flags) ? orM [ andM [notM cross, return (stage >= Stage2)], haveCurses ] `cabalFlag` "terminfo" + builder (Cabal Flags) ? haveCurses `cabalFlag` "terminfo" -------------------------------- terminfo ------------------------------ , package terminfo ? View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9bcfd140909e9223ebaba055a5ebc66c... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9bcfd140909e9223ebaba055a5ebc66c... You're receiving this email because of your account on gitlab.haskell.org.