Add `-haddock` to perf.mk rather than prepare-system.sh
authorTakenobu Tani <takenobu.hs@gmail.com>
Sun, 14 Apr 2019 10:11:12 +0000 (19:11 +0900)
committerMarge Bot <ben+marge-bot@smart-cactus.org>
Mon, 3 Jun 2019 02:54:43 +0000 (22:54 -0400)
To cover ci conditions from ghc8.6 to 8.9, I add `-haddock` option
to `mk/flavours/perf.mk` rather than `.circleci/prepare-system.sh`.

Because in windows condition of ghc-8.9, `mk/flavours/*` is included
after `prepare-system.sh`.

In addition, in linux condition of ghc-8.6, `mk/flavors/perf.mk` is used.

.circleci/prepare-system.sh
mk/flavours/perf.mk

index ab82d4d..804e0fd 100755 (executable)
@@ -29,7 +29,6 @@ cat <<EOF >> mk/build.mk
 BuildFlavour=$BUILD_FLAVOUR
 ifneq "\$(BuildFlavour)" ""
 include mk/flavours/\$(BuildFlavour).mk
-GhcLibHcOpts+=-haddock
 endif
 EOF
 
index ee85662..93c5919 100644 (file)
@@ -1,7 +1,7 @@
 SRC_HC_OPTS        = -O -H64m
 GhcStage1HcOpts    = -O2
 GhcStage2HcOpts    = -O2
-GhcLibHcOpts       = -O2
+GhcLibHcOpts       = -O2 -haddock
 BUILD_PROF_LIBS    = YES
 #HADDOCK_DOCS
 #BUILD_SPHINX_HTML