diff options
| author | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-03-29 16:59:57 +0200 |
|---|---|---|
| committer | Andreas Klebinger <klebinger.andreas@gmx.at> | 2020-03-29 16:59:57 +0200 |
| commit | 40e000d94ba24c1a1d4fca85364289516ecee375 (patch) | |
| tree | e22dba2df4538266ae06968b1cfa0331c0c8ff4b | |
| parent | 6d172e63f3dd3590b0a57371efb8f924f1fcdf05 (diff) | |
| download | haskell-wip/andreask/hadrian_ghci_fix.tar.gz | |
Make sure hadrian/ghci passes flags in a single line.wip/andreask/hadrian_ghci_fix
This caused trouble on windows and stopped hadrian/ghci from working
there.
| -rwxr-xr-x | hadrian/ghci-cabal | 3 | ||||
| -rwxr-xr-x | hadrian/ghci-stack | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/hadrian/ghci-cabal b/hadrian/ghci-cabal index 93343e4e28..7c0f968dc1 100755 --- a/hadrian/ghci-cabal +++ b/hadrian/ghci-cabal @@ -2,5 +2,6 @@ set -e -GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build-cabal" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@")" +TOOL_ARGS=$(TERM=dumb CABFLAGS=-v0 "hadrian/build-cabal" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@" | dos2unix | paste -s -d ' ' - ) +GHC_FLAGS="$GHC_FLAGS $TOOL_ARGS" ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m diff --git a/hadrian/ghci-stack b/hadrian/ghci-stack index 3c850cdac8..a6a2b3a8f9 100755 --- a/hadrian/ghci-stack +++ b/hadrian/ghci-stack @@ -2,5 +2,6 @@ set -e -GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build-stack" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@")" +TOOL_ARGS=$(TERM=dumb CABFLAGS=-v0 "hadrian/build-cabal" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@" | dos2unix | paste -s -d ' ' - ) +GHC_FLAGS="$GHC_FLAGS $TOOL_ARGS" stack exec -- ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m |