tools: fix ugly warnings after using multiple cabal versions

This commit is contained in:
Simon Michael 2016-12-30 14:33:14 -08:00
parent 3bfc5f7743
commit eaadc927a7

View File

@ -191,10 +191,10 @@ WARNINGS:=\
# GHCMEMFLAGS= #+RTS -M200m -RTS
# ghc builds need the macro definitions generated by cabal
# from cabal's dist or dist-sandbox, hopefully there's just one
# from cabal's dist or dist-sandbox dir, hopefully there's just one
#CABALMACROSFLAGS=-optP-include -optP hledger/dist*/build/autogen/cabal_macros.h
# from stack's dist, hopefully there's just one
CABALMACROSFLAGS=-optP-include -optP hledger/.stack-work/dist/*/*/build/autogen/cabal_macros.h
# from stack's dist dir, hopefully there's just one. If not (after cabal upgrade), will get warnings. Maybe obsolete ?
#CABALMACROSFLAGS=-optP-include -optP hledger/.stack-work/dist/*/*/build/autogen/cabal_macros.h
BUILDFLAGS1:=-rtsopts $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) $(GHCMEMFLAGS) $(CABALMACROSFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) -DDEVELOPMENT
BUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='"$(VERSION)dev"'