Merge branch 'master' into tor

This commit is contained in:
Joey Hess 2016-11-17 13:40:01 -04:00
commit e830285431
No known key found for this signature in database
GPG key ID: C910D9222512E3C7

2
ghci
View file

@ -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