Bump haskeline submodule to 0.8.0.1wip/bump-haskeline

(cherry picked from commit feb3b955402d53c3875dd7a9a39f322827e5bd69)

3 files changed, 11 insertions, 0 deletions

diff --git a/ghc.mk b/ghc.mk
index f337333d9a..83a2853ddb 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -462,6 +462,10 @@ else
 libraries/haskeline_CONFIGURE_OPTS += --flags=-terminfo
 endif
 
+# ghc-cabal doesn't currently support packages containing both libraries
+# and executables. This flag disables the latter.
+libraries/haskeline_CONFIGURE_OPTS += --flags=-examples
+
 PACKAGES_STAGE1 += stm
 PACKAGES_STAGE1 += exceptions
 PACKAGES_STAGE1 += haskeline
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs
index b0e012d31e..9e43459a0f 100644
--- a/hadrian/src/Settings/Packages.hs
+++ b/hadrian/src/Settings/Packages.hs
@@ -132,6 +132,13 @@ packageArgs = do
           builder (Cabal Flags) ? arg "in-ghc-tree"
 
         ------------------------------- haskeline ------------------------------
+        -- Hadrian doesn't currently support packages containing both libraries
+        -- and executables. This flag disables the latter.
+        , package haskeline ?
+          builder (Cabal Flags) ? arg "-examples"
+        -- Don't depend upon terminfo when cross-compiling to avoid unnecessary
+        -- dependencies.
+        -- TODO: Perhaps the user should rather be responsible for this?
         , package haskeline ?
           builder (Cabal Flags) ? cross ? arg "-terminfo"
 
diff --git a/libraries/haskeline b/libraries/haskeline
-Subproject 98d69248d08389f349e12981da43797b8860ae6
+Subproject 463fc49d17bfab846cceba48bccc02ef285e6cb