summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-17 23:04:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-20 16:20:42 -0400
commit590fd490750e84c62d8669cb2db6885e26cc17cd (patch)
treebb01e72ad1059c05b0848bc3c5b44623302cf809
parent3165e815046787d47c283a32c7f87f504aceda9f (diff)
workaround for ghci fragility in reusing objects compiled with ghc
-rw-r--r--.ghci3
-rw-r--r--Makefile4
-rwxr-xr-xghci5
3 files changed, 9 insertions, 3 deletions
diff --git a/.ghci b/.ghci
index 318bac202..c5550cee6 100644
--- a/.ghci
+++ b/.ghci
@@ -1,4 +1 @@
--- make ghci use precompiled modules, and C library
-:set -outputdir=tmp
-:set -IUtility
:load Common
diff --git a/Makefile b/Makefile
index c4341b9ae..796e6af8b 100644
--- a/Makefile
+++ b/Makefile
@@ -221,4 +221,8 @@ osxapp:
rm -f tmp/git-annex.dmg.bz2
bzip2 tmp/git-annex.dmg
+# used by ./ghci
+getflags:
+ @echo $(ALLFLAGS)
+
.PHONY: $(bins) test install
diff --git a/ghci b/ghci
new file mode 100755
index 000000000..57361281c
--- /dev/null
+++ b/ghci
@@ -0,0 +1,5 @@
+#!/bin/sh
+# This runs ghci with the same flags used when compiling with ghc.
+# Certian flags need to be the same in order for ghci to reuse compiled
+# objects.
+ghci $(make getflags) $@