diff options
| -rw-r--r-- | .gitignore | 5 | ||||
| -rwxr-xr-x | utils/ghc-in-ghci/run.sh | 2 | ||||
| -rw-r--r-- | utils/ghc-in-ghci/settings.ghci | 6 |
3 files changed, 11 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 7e2425c964..c72d044473 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,8 @@ GIT_COMMIT_ID # Should be equal to testdir_suffix from testsuite/driver/testlib.py. *.run + +# ----------------------------------------------------------------------------- +# Output of ghc-in-ghci + +/.ghci-objects/
\ No newline at end of file diff --git a/utils/ghc-in-ghci/run.sh b/utils/ghc-in-ghci/run.sh index 2dda647903..521458f67d 100755 --- a/utils/ghc-in-ghci/run.sh +++ b/utils/ghc-in-ghci/run.sh @@ -30,7 +30,5 @@ exec ./inplace/bin/ghc-stage2 \ --interactive \ -ghci-script ./utils/ghc-in-ghci/settings.ghci \ -ghci-script ./utils/ghc-in-ghci/load-main.ghci \ - -odir ./ghci-tmp \ - -hidir ./ghci-tmp \ +RTS -A128m -RTS \ "$@" diff --git a/utils/ghc-in-ghci/settings.ghci b/utils/ghc-in-ghci/settings.ghci index 1348274288..8f5ba6e031 100644 --- a/utils/ghc-in-ghci/settings.ghci +++ b/utils/ghc-in-ghci/settings.ghci @@ -36,6 +36,12 @@ :set -DGHC_LOADED_INTO_GHCI :set -XNoImplicitPrelude +-- -fobject-code is required because bytecode doesn't support unboxed tuples +-- https://ghc.haskell.org/trac/ghc/ticket/1257 +:set -odir ./.ghci-objects +:set -hidir ./.ghci-objects +:set -fobject-code + -- Setup args so that running "main" will run ghci and set the prompt to -- indicate that it is an inner ghci. :set args --interactive -ghci-script utils/ghc-in-ghci/inner.ghci |