summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2021-04-27 15:33:18 +0100
committerMatthew Pickering <matthewtpickering@gmail.com>2021-04-27 15:33:18 +0100
commit5b957132e782f9cf16586d6847eaf54c994ffded (patch)
tree52ec29a0703ad721b463a96bf9327bcd707372bc
parent95eadc384aab0dda15b046765355dfb89a8368b1 (diff)
downloadhaskell-wip/ghc-hash-builds.tar.gz
Use -fkeep-goingwip/ghc-hash-builds
-rw-r--r--ghc/GHCi/UI.hs2
-rw-r--r--testsuite/tests/ghci/scripts/T9293.stdout3
-rw-r--r--testsuite/tests/ghci/scripts/ghci024.stdout1
-rw-r--r--testsuite/tests/ghci/scripts/ghci057.stdout3
4 files changed, 8 insertions, 1 deletions
diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs
index c10f6051ea..c52104985f 100644
--- a/ghc/GHCi/UI.hs
+++ b/ghc/GHCi/UI.hs
@@ -480,7 +480,7 @@ interactiveUI config srcs maybe_exprs = do
LangExt.MonomorphismRestriction xopt_unset)
$ dflags
GHC.setInteractiveDynFlags dflags'
- GHC.setSessionDynFlags
+ _ <- GHC.setProgramDynFlags
-- Set Opt_KeepGoing so that :reload loads as much as
-- possible
(gopt_set dflags Opt_KeepGoing)
diff --git a/testsuite/tests/ghci/scripts/T9293.stdout b/testsuite/tests/ghci/scripts/T9293.stdout
index 15c36fb34e..70803c3f14 100644
--- a/testsuite/tests/ghci/scripts/T9293.stdout
+++ b/testsuite/tests/ghci/scripts/T9293.stdout
@@ -9,6 +9,7 @@ other dynamic, non-language, flag settings:
-fignore-hpc-changes
-fno-ghci-history
-fimplicit-import-qualified
+ -fkeep-going
-fshow-warning-groups
warning settings:
-Wsemigroup
@@ -29,6 +30,7 @@ other dynamic, non-language, flag settings:
-fignore-hpc-changes
-fno-ghci-history
-fimplicit-import-qualified
+ -fkeep-going
-fshow-warning-groups
warning settings:
-Wsemigroup
@@ -48,6 +50,7 @@ other dynamic, non-language, flag settings:
-fignore-hpc-changes
-fno-ghci-history
-fimplicit-import-qualified
+ -fkeep-going
-fshow-warning-groups
warning settings:
-Wsemigroup
diff --git a/testsuite/tests/ghci/scripts/ghci024.stdout b/testsuite/tests/ghci/scripts/ghci024.stdout
index 7cf36ac041..20750f5817 100644
--- a/testsuite/tests/ghci/scripts/ghci024.stdout
+++ b/testsuite/tests/ghci/scripts/ghci024.stdout
@@ -10,6 +10,7 @@ other dynamic, non-language, flag settings:
-fignore-hpc-changes
-fno-ghci-history
-fimplicit-import-qualified
+ -fkeep-going
-fshow-warning-groups
warning settings:
-Wsemigroup
diff --git a/testsuite/tests/ghci/scripts/ghci057.stdout b/testsuite/tests/ghci/scripts/ghci057.stdout
index 15c36fb34e..70803c3f14 100644
--- a/testsuite/tests/ghci/scripts/ghci057.stdout
+++ b/testsuite/tests/ghci/scripts/ghci057.stdout
@@ -9,6 +9,7 @@ other dynamic, non-language, flag settings:
-fignore-hpc-changes
-fno-ghci-history
-fimplicit-import-qualified
+ -fkeep-going
-fshow-warning-groups
warning settings:
-Wsemigroup
@@ -29,6 +30,7 @@ other dynamic, non-language, flag settings:
-fignore-hpc-changes
-fno-ghci-history
-fimplicit-import-qualified
+ -fkeep-going
-fshow-warning-groups
warning settings:
-Wsemigroup
@@ -48,6 +50,7 @@ other dynamic, non-language, flag settings:
-fignore-hpc-changes
-fno-ghci-history
-fimplicit-import-qualified
+ -fkeep-going
-fshow-warning-groups
warning settings:
-Wsemigroup