summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-24 14:43:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-24 14:43:32 -0400
commita5278189ff0da1acdd6d4dfcf720ec8e75e222c7 (patch)
treecbf233c8349e1207c61234cd23bac928043f409d /Makefile
parenteb7190535a63c3a4f92b6968cea7f3b1df56cdbc (diff)
deal with mtl/monads-tf conflict
I had been using -ignore-package monads-tf to deal with this, but the XMPP library uses monads-tf, so that also ignores it. Instead, use PackageImports to force use of mtl in my own code.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 1da32ebc7..d0409d64b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
CFLAGS=-Wall
GIT_ANNEX_TMP_BUILD_DIR?=tmp
-IGNORE=-ignore-package monads-fd -ignore-package monads-tf
+IGNORE=-ignore-package monads-fd
BASEFLAGS=-Wall $(IGNORE) -outputdir $(GIT_ANNEX_TMP_BUILD_DIR) -IUtility
# If you get build failures due to missing haskell libraries,