@@ -1,7 +1,9 @@
1version := $(shell awk '/^version:/{print $$2}' ../text.cabal)
1version := $(shell awk '/^version:/{print $$2}' ../text.cabal)
3ghc-opt-flags = -O0
3ghc-opt-flags = -O0
4+ghc-base-flags := -funbox-strict-fields -hide-all-packages \
5+ -package base -package mtl -package random -package directory \
4−ghc-base-flags := -funbox-strict-fields -package criterion -package deepseq \
6+ -package criterion -package deepseq \
5 -package bytestring -ignore-package text \
7 -package bytestring -ignore-package text \
6 -fno-ignore-asserts
8 -fno-ignore-asserts
7ghc-test-flags := -package QuickCheck -package test-framework -package deepseq \
9ghc-test-flags := -package QuickCheck -package test-framework -package deepseq \
@@ -30,7 +32,7 @@ else
30 cd .. && cabal build
32 cd .. && cabal build
33−Properties.o qc qc-hpc: ghc-flags += $(ghc-test-flags)
35+Properties.o Regressions.o qc qc-hpc: ghc-flags += $(ghc-test-flags)
34Properties.o: QuickCheckUtils.o SlowFunctions.o
36Properties.o: QuickCheckUtils.o SlowFunctions.o
36QuickCheckUtils.o: $(lib)
38QuickCheckUtils.o: $(lib)
@@ -44,7 +46,7 @@ sb: SearchBench.o SlowFunctions.o
44qc-hpc: Properties.hs QuickCheckUtils.hs $(lib-srcs:%=../%)
46qc-hpc: Properties.hs QuickCheckUtils.hs $(lib-srcs:%=../%)
45 -mkdir -p hpcdir
47 -mkdir -p hpcdir
46 @rm -f $@.tix
48 @rm -f $@.tix
47− $(ghc) $(ghc-hpc-flags) $(ghc-opt-flags) -ihpcdir \
49+ $(ghc) $(ghc-hpc-flags) $(ghc-test-flags) $(ghc-opt-flags) -ihpcdir \
48 --make -threaded -o $@ $<
50 --make -threaded -o $@ $<
50regressions: Regressions.o
52regressions: Regressions.o
@@ -59,7 +61,7 @@ qc-hpc-html/hpc_index.html: qc-hpc
59 --exclude=QuickCheckUtils --srcdir=.. --srcdir=. --destdir=$(dir $@)
61 --exclude=QuickCheckUtils --srcdir=.. --srcdir=. --destdir=$(dir $@)
61Benchmarks.o: ghc-opt-flags = -O
63Benchmarks.o: ghc-opt-flags = -O
62−bm Benchmarks.o: ghc-flags += -hide-package transformers -package utf8-string
64+bm Benchmarks.o: ghc-flags += -package utf8-string
63bm: Benchmarks.o
65bm: Benchmarks.o
64 $(ghc) $(ghc-flags) -o $@ $^ $(lib)
66 $(ghc) $(ghc-flags) -o $@ $^ $(lib)