From 40e000d94ba24c1a1d4fca85364289516ecee375 Mon Sep 17 00:00:00 2001 From: Andreas Klebinger Date: Sun, 29 Mar 2020 16:59:57 +0200 Subject: Make sure hadrian/ghci passes flags in a single line. This caused trouble on windows and stopped hadrian/ghci from working there. --- hadrian/ghci-cabal | 3 ++- 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 -- cgit v1.2.1