From 169a4944c241fb24c2f8f153ded76687eeea30d8 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 9 Jul 2010 02:11:12 +0000 Subject: [PATCH] tools: make ghc prefer /usr/lib to avoid iconv link issues on mac Harmless on other platforms, hopefully. --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dab871911..db2c55ba3 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,8 @@ BINARYFILENAME=`runhaskell ./hledger.hs --binary-filename` PATCHLEVEL:=$(shell expr `darcs changes --count --from-tag=\\\\\.` - 1) WARNINGS:=-W -fwarn-tabs #-fwarn-orphans -fwarn-simple-patterns -fwarn-monomorphism-restriction -fwarn-name-shadowing DEFINEFLAGS:=-DMAKE -DPATCHLEVEL=$(PATCHLEVEL) $(OPTFLAGS) -BUILDFLAGS:=$(DEFINEFLAGS) $(WARNINGS) -ihledger-lib +PREFERMACUSRLIBFLAGS=-L/usr/lib +BUILDFLAGS:=$(PREFERMACUSRLIBFLAGS) $(DEFINEFLAGS) $(WARNINGS) -ihledger-lib TIME:=$(shell date +"%Y%m%d%H%M") # file defining the current release version @@ -336,7 +337,7 @@ cleansite: site/hakyll cd site; ./hakyll clean site/hakyll: site/hakyll.hs - cd site; ghc --make hakyll.hs + cd site; ghc --make hakyll.hs $(PREFERMACUSRLIBFLAGS) viewsite: site $(VIEWHTML) site/_site/index.html