diff options
| author | Neil Mitchell <ndmitchell@gmail.com> | 2018-08-09 13:47:20 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-08-17 14:53:51 -0400 |
| commit | 8154faf5a7236f27e0eb3409bb45c3f3c52320e7 (patch) | |
| tree | 0aa26426424e84756580008ae856958ca56de679 /utils | |
| parent | 2748e9574106b854f56e61fbbbac16bce44eaecb (diff) | |
| download | haskell-8154faf5a7236f27e0eb3409bb45c3f3c52320e7.tar.gz | |
Make ghci work for stage1 and Hadrian
This allows you to use the ghc-in-ghci script in Make even if you
haven't built stage2, and also with Hadrian. Because of the way -I
works, it will prefer Make/stage2.
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/ghc-in-ghci/settings.ghci | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/utils/ghc-in-ghci/settings.ghci b/utils/ghc-in-ghci/settings.ghci index 8f5ba6e031..dd914d1491 100644 --- a/utils/ghc-in-ghci/settings.ghci +++ b/utils/ghc-in-ghci/settings.ghci @@ -25,9 +25,6 @@ :set -icompiler/vectorise :set -ighc :set -Icompiler -:set -Icompiler/stage2 -:set -Icompiler/stage2/build -:set -icompiler/stage2/build :set -Iincludes :set -Iincludes/dist-derivedconstants/header :set -package=ghc-boot-th @@ -36,6 +33,25 @@ :set -DGHC_LOADED_INTO_GHCI :set -XNoImplicitPrelude +-- make it work for Make stage2 +:set -Icompiler/stage2 +:set -Icompiler/stage2/build +:set -icompiler/stage2/build + +-- make it work for Make stage1 +:set -Icompiler/stage1 +:set -Icompiler/stage1/build +:set -icompiler/stage1/build + +-- make it work for Hadrian stage2 +:set -I_build/generated +:set -I_build/stage2/compiler/build +:set -i_build/stage2/compiler/build + +-- make it work for Hadrian stage1 +:set -I_build/stage1/compiler/build +:set -i_build/stage1/compiler/build + -- -fobject-code is required because bytecode doesn't support unboxed tuples -- https://ghc.haskell.org/trac/ghc/ticket/1257 :set -odir ./.ghci-objects |