summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Denis <xldenis@gmail.com>2020-01-21 09:06:49 +0100
committerMarge Bot <ben+marge-bot@smart-cactus.org>2020-01-25 05:23:39 -0500
commitb1a32170a1b8e7a31c2dd28eb1b02f1375ea3998 (patch)
tree6fbc55ca05381be04bfc02cea0124fd7a7f0f884
parent6eb566a0cf43aefaf451f5885ca9b56686840a23 (diff)
downloadhaskell-b1a32170a1b8e7a31c2dd28eb1b02f1375ea3998.tar.gz
Create ghci.cabal.sh
-rwxr-xr-xhadrian/ghci.cabal.sh6
-rwxr-xr-xhadrian/ghci.sh8
2 files changed, 9 insertions, 5 deletions
diff --git a/hadrian/ghci.cabal.sh b/hadrian/ghci.cabal.sh
new file mode 100755
index 0000000000..f31b94574f
--- /dev/null
+++ b/hadrian/ghci.cabal.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+set -e
+
+GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build.cabal.sh" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@")"
+ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m
diff --git a/hadrian/ghci.sh b/hadrian/ghci.sh
index f31b94574f..06ad47a66e 100755
--- a/hadrian/ghci.sh
+++ b/hadrian/ghci.sh
@@ -1,6 +1,4 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
-set -e
-
-GHC_FLAGS="$GHC_FLAGS $(TERM=dumb CABFLAGS=-v0 "hadrian/build.cabal.sh" tool-args -q --build-root=.hadrian_ghci --flavour=ghc-in-ghci "$@")"
-ghci $GHC_FLAGS "$@" -fno-code -fwrite-interface -hidir=.hadrian_ghci/interface -O0 ghc/Main.hs +RTS -A128m
+# By default on Linux/MacOS we build Hadrian using Cabal
+(. "hadrian/ghci.cabal.sh" "$@")