On Wed, Oct 22, 2014 at 04:35:04PM +0200, 'Klaus Aehlig' via ganeti-devel
wrote:
commit e0c69c2ade867c7afa321f1cbcb5c6aba880b9a3
Merge: 0b64e8e 02d233c
Author: Klaus Aehlig <[email protected]>
Date: Wed Oct 22 16:31:47 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Add a target to inspect make variables
Have fatal warnings on in developer mode
Add a flag --developer-mode
Fix check for sphinx-build from python2-sphinx
use the Python interpreter from env
Signed-off-by: Klaus Aehlig <[email protected]>
diff --cc Makefile.am
index a1f37f0,76dfcd3..15dc269
--- a/Makefile.am
+++ b/Makefile.am
@@@ -643,23 -617,10 +643,26 @@@ HFLAGS =
-fwarn-monomorphism-restriction \
-fwarn-tabs \
$(GHC_BYVERSION_FLAGS)
+ if DEVELOPER_MODE
+ HFLAGS += -Werror
+ endif
+if HPROFILE
+HFLAGS += -prof -auto-all
+endif
+if HCOVERAGE
+HFLAGS += -fhpc
+endif
+if HTEST
+HFLAGS += -DTEST
+endif
+
+HTEST_SUFFIX = hpc
+
+HTEST_FLAGS = $(HFLAGS) -fhpc -itest/hs \
+ -osuf .$(HTEST_SUFFIX)_o \
+ -hisuf .$(HTEST_SUFFIX)_hi
+
# extra flags that can be overriden on the command line (e.g. -Wwarn, etc.)
HEXTRA =
# internal extra flags (used for test/hs/htest mainly)
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
LGTM, thanks
