mirror of
https://github.com/simonmichael/hledger.git
synced 2024-11-07 21:15:19 +03:00
tools: fix make test and others now that we're using cabal macros like MIN_VERSION_directory
This commit is contained in:
parent
0d99c7cf73
commit
53f602c4cf
7
Makefile
7
Makefile
@ -120,11 +120,12 @@ WEBLANGEXTS:=\
|
|||||||
# -XNoMonomorphismRestriction
|
# -XNoMonomorphismRestriction
|
||||||
PREFERMACUSRLIBFLAGS=-L/usr/lib
|
PREFERMACUSRLIBFLAGS=-L/usr/lib
|
||||||
GHCMEMFLAGS= #+RTS -M200m -RTS
|
GHCMEMFLAGS= #+RTS -M200m -RTS
|
||||||
BUILDFLAGS1:=-rtsopts $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) $(GHCMEMFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) -DBLAZE_HTML_0_5 -DDEVELOPMENT
|
CABALMACROSFLAGS=-optP-include -optPhledger/dist/build/autogen/cabal_macros.h
|
||||||
|
BUILDFLAGS1:=-rtsopts $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) $(GHCMEMFLAGS) $(CABALMACROSFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) -DBLAZE_HTML_0_5 -DDEVELOPMENT
|
||||||
BUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='"$(VERSION)dev"'
|
BUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='"$(VERSION)dev"'
|
||||||
PROFBUILDFLAGS:=-prof -fprof-auto -osuf hs_p
|
PROFBUILDFLAGS:=-prof -fprof-auto -osuf hs_p
|
||||||
# different quoting, & cabal macros, for auto builds:
|
# sp needs different quoting:
|
||||||
AUTOBUILDFLAGS:=$(BUILDFLAGS1) $(PROFBUILDFLAGS) -DVERSION='\"$(VERSION)dev\"' -optP-include -optPhledger/dist/build/autogen/cabal_macros.h
|
AUTOBUILDFLAGS:=$(BUILDFLAGS1) $(PROFBUILDFLAGS) -DVERSION='\"$(VERSION)dev\"'
|
||||||
LINUXRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) -O2 -static -optl-static -optl-pthread
|
LINUXRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) -O2 -static -optl-static -optl-pthread
|
||||||
MACRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) -O2 # -optl-L/usr/lib
|
MACRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) -O2 # -optl-L/usr/lib
|
||||||
#WINDOWSRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS)
|
#WINDOWSRELEASEBUILDFLAGS:=-DMAKE $(WARNINGS) $(INCLUDEPATHS)
|
||||||
|
Loading…
Reference in New Issue
Block a user