[commit: ghc] ghc-8.2: Disable terminfo, if we don’t build it. (f38e76a)

git at git.haskell.org git at git.haskell.org
Thu Apr 27 20:10:24 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.2
Link       : http://ghc.haskell.org/trac/ghc/changeset/f38e76a3a8d9fa905c1664a53358bea51d57d206/ghc

>---------------------------------------------------------------

commit f38e76a3a8d9fa905c1664a53358bea51d57d206
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Mon Apr 24 09:38:14 2017 -0400

    Disable terminfo, if we don’t build it.
    
    This is a derivation of a patch from @jophish.
    
    This is necessary due to `haskeline`'s `terminfo` flag being marked as
    `Manual` as of 43d7fa106027fcd4ec7f443923a8dd5b8c169f9c.
    
    Reviewers: jophish, bgamari, austin
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie, jophish
    
    Differential Revision: https://phabricator.haskell.org/D3493
    
    (cherry picked from commit d5cb4d2b7fab89ea1c3fc74da2317f86e75816ea)


>---------------------------------------------------------------

f38e76a3a8d9fa905c1664a53358bea51d57d206
 ghc.mk | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ghc.mk b/ghc.mk
index 813b3f5..ca2aa95 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -471,7 +471,10 @@ endif
 
 ifeq "$(WITH_TERMINFO)" "YES"
 PACKAGES_STAGE1 += terminfo
+else
+libraries/haskeline_CONFIGURE_OPTS += --flags=-terminfo
 endif
+
 PACKAGES_STAGE1 += haskeline
 PACKAGES_STAGE1 += ghci
 



More information about the ghc-commits mailing list