summaryrefslogtreecommitdiff
path: root/hadrian
diff options
context:
space:
mode:
Diffstat (limited to 'hadrian')
-rw-r--r--hadrian/.gitignore2
-rwxr-xr-xhadrian/ghci-cabal.in (renamed from hadrian/ghci-cabal)4
-rwxr-xr-xhadrian/ghci-stack.in (renamed from hadrian/ghci-stack)4
3 files changed, 8 insertions, 2 deletions
diff --git a/hadrian/.gitignore b/hadrian/.gitignore
index 91e8fb77c8..360b19cbd7 100644
--- a/hadrian/.gitignore
+++ b/hadrian/.gitignore
@@ -1,5 +1,7 @@
# generated by the configure script
cfg/system.config
+/ghci-stack
+/ghci-cabal
# build.bat and build specific
/bin/
diff --git a/hadrian/ghci-cabal b/hadrian/ghci-cabal.in
index 6250ef73f1..2a97b37180 100755
--- a/hadrian/ghci-cabal
+++ b/hadrian/ghci-cabal.in
@@ -1,7 +1,9 @@
#!/usr/bin/env sh
+# This file is generated by configure from ghci-cabal.in
+
set -e
# Replace newlines with spaces, as these otherwise break the ghci invocation on windows.
GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build-cabal" tool:ghc/Main.hs -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci $HADRIAN_ARGS | tr '\n\r' ' ')"
-ghci $GHC_FLAGS $@ -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 +RTS -A128m
+@WithGhc@ --interactive $GHC_FLAGS $@ -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 +RTS -A128m
diff --git a/hadrian/ghci-stack b/hadrian/ghci-stack.in
index 9815879a77..ef95552b64 100755
--- a/hadrian/ghci-stack
+++ b/hadrian/ghci-stack.in
@@ -1,7 +1,9 @@
#!/usr/bin/env sh
+# This file is generated by configure from ghci-stack.in
+
set -e
# Replace newlines with spaces, as these otherwise break the ghci invocation on windows.
GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build-stack" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci $HADRIAN_ARGS | tr '\n\r' ' ')"
-stack exec -- ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 +RTS -A128m
+stack exec -- @WithGhc@ --interactive $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 +RTS -A128m