summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Sergei Trofimovich <slyfox@gentoo.org>2012-06-10 12:03:11 +0300
committerGravatar Joey Hess <joey@kitenet.net>2012-06-10 12:11:30 -0400
commit3bb58afd594c7208a34749202a858644498acb6f (patch)
treef2440ddaefa2bffc0c9bb5bac0f11d208f4c8636
parent3d6dc335636f1414c3d4ff8f86ea413ed5a83169 (diff)
Makefile: ignore monads-tf in favour of mtl
Fixes build breakage when both 'mtl' and 'monads-tf' are present: $ make git-annex > ghc -O2 -Wall -ignore-package monads-fd -outputdir tmp -IUtility -DWITH_S3 --make git-annex Utility/libdiskfree.o > > Common.hs:6:8: > Ambiguous module name `Control.Monad.State.Strict': > it was found in multiple packages: monads-tf-0.1.0.0 mtl-2.1.1 > make: *** [git-annex] Error 1 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 94dc05a81..2d8146c85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
PREFIX=/usr
-IGNORE=-ignore-package monads-fd
+IGNORE=-ignore-package monads-fd -ignore-package monads-tf
BASEFLAGS=-Wall $(IGNORE) -outputdir tmp -IUtility -DWITH_S3
GHCFLAGS=-O2 $(BASEFLAGS)