Add `-haddock` to prepare-system.sh and .gitlab-ci.yml wip/backport-MR769
authorTakenobu Tani <takenobu.hs@gmail.com>
Sun, 14 Apr 2019 12:31:05 +0000 (21:31 +0900)
committerBen Gamari <ben@smart-cactus.org>
Wed, 12 Jun 2019 12:39:41 +0000 (08:39 -0400)
To cover ci conditions from ghc8.6 to 8.9, I add `-haddock` option
to `.circleci/prepare-system.sh` and .gitlab-ci.yml.
after including `mk/flavours/*`.

(cherry picked from commit c4f94320a7048a7f263d8d952d4e12cc0227cf72)

.circleci/prepare-system.sh
.gitlab-ci.yml
mk/flavours/perf.mk

index 804e0fd..fbbb81b 100755 (executable)
@@ -30,6 +30,7 @@ BuildFlavour=$BUILD_FLAVOUR
 ifneq "\$(BuildFlavour)" ""
 include mk/flavours/\$(BuildFlavour).mk
 endif
+GhcLibHcOpts+=-haddock
 EOF
 
 case "$(uname)" in
index 4b54f28..86192d8 100644 (file)
@@ -563,6 +563,7 @@ nightly-i386-windows-hadrian:
       python boot
       bash -c './configure --enable-tarballs-autodownload GHC=`pwd`/toolchain/bin/ghc HAPPY=`pwd`/toolchain/bin/happy ALEX=`pwd`/toolchain/bin/alex $CONFIGURE_ARGS'
     - bash -c "echo include mk/flavours/${BUILD_FLAVOUR}.mk > mk/build.mk"
+    - bash -c "echo 'GhcLibHcOpts+=-haddock' >> mk/build.mk"
     - bash -c "PATH=`pwd`/toolchain/bin:$PATH make -j`mk/detect-cpu-count.sh`"
     - bash -c "PATH=`pwd`/toolchain/bin:$PATH make binary-dist TAR_COMP_OPTS=-1"
     - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml'
index 93389b4..06fcc24 100644 (file)
@@ -1,7 +1,7 @@
 SRC_HC_OPTS        = -O -H64m
 GhcStage1HcOpts    = -O
 GhcStage2HcOpts    = -O2
-GhcLibHcOpts       = -O2 -haddock
+GhcLibHcOpts       = -O2
 BUILD_PROF_LIBS    = YES
 #SplitObjs
 #HADDOCK_DOCS