summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/ghc-in-ghci/settings.ghci22
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