Merge branch 'master' into tor

1 files changed, 1 insertions, 1 deletions

diff --git a/ghci b/ghci
index b8e4539df..fccfc661a 100755
--- a/ghci
+++ b/ghci
@@ -1,4 +1,4 @@
 #!/bin/sh
 # ghci using objects built by cabal
 make dist/caballog
-$(grep 'ghc --make' dist/caballog | head -n 1 | perl -pe 's/--make/--interactive/; s/.\/[^\.\s]+.hs//; s/-package-id [^\s]+//g; s/-hide-all-packages//; s/-threaded//') $@
+$(grep 'ghc --make' dist/caballog | head -n 1 | perl -pe 's/--make/--interactive/; s/.\/[^\.\s]+.hs//; s/-package-id [^\s]+//g; s/-hide-all-packages//; s/-threaded//') $@ -fno-warn-tabs