From 83209b862cf47786e786cb76e1ccbcda4e322021 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Tue, 7 Apr 2015 19:28:57 -0700 Subject: [PATCH] tools: fix overuse of -XCPP breaking make test etc. --- Makefile | 2 +- hledger-web/Hledger/Web/Main.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8b0f86a09..f76dbbaca 100644 --- a/Makefile +++ b/Makefile @@ -142,7 +142,7 @@ PREFERMACUSRLIBFLAGS=-L/usr/lib GHCMEMFLAGS= #+RTS -M200m -RTS CABALMACROSFLAGS=-optP-include -optPhledger/dist/build/autogen/cabal_macros.h BUILDFLAGS1:=-rtsopts $(WARNINGS) $(INCLUDEPATHS) $(PREFERMACUSRLIBFLAGS) $(GHCMEMFLAGS) $(CABALMACROSFLAGS) -DPATCHLEVEL=$(PATCHLEVEL) -DDEVELOPMENT -BUILDFLAGS:=$(BUILDFLAGS1) -XCPP -DVERSION='"$(VERSION)dev"' +BUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='"$(VERSION)dev"' PROFBUILDFLAGS:=-prof -fprof-auto -osuf hs_p # sp needs different quoting: AUTOBUILDFLAGS:=$(BUILDFLAGS1) -DVERSION='\"$(VERSION)dev\"' # $(PROFBUILDFLAGS) diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs index c1065b5fd..279315cb0 100644 --- a/hledger-web/Hledger/Web/Main.hs +++ b/hledger-web/Hledger/Web/Main.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE CPP, OverloadedStrings #-} {-| hledger-web - a hledger add-on providing a web interface.