[commit: ghc] master: Make ghci work for stage1 and Hadrian (8154faf)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8154faf5a7236f27e0eb3409bb45c3f3c52320e7/ghc

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

commit 8154faf5a7236f27e0eb3409bb45c3f3c52320e7
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Thu Aug 9 13:47:20 2018 +0100

    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.


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

8154faf5a7236f27e0eb3409bb45c3f3c52320e7
 utils/ghc-in-ghci/settings.ghci | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/utils/ghc-in-ghci/settings.ghci b/utils/ghc-in-ghci/settings.ghci
index 8f5ba6e..dd914d1 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