Commit c4f94320 authored by Takenobu Tani's avatar Takenobu Tani Committed by Marge Bot
Browse files

Add `-haddock` to prepare-system.sh and .gitlab-ci.yml

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/*`.
parent 43a39c3c
...@@ -30,6 +30,7 @@ BuildFlavour=$BUILD_FLAVOUR ...@@ -30,6 +30,7 @@ BuildFlavour=$BUILD_FLAVOUR
ifneq "\$(BuildFlavour)" "" ifneq "\$(BuildFlavour)" ""
include mk/flavours/\$(BuildFlavour).mk include mk/flavours/\$(BuildFlavour).mk
endif endif
GhcLibHcOpts+=-haddock
EOF EOF
case "$(uname)" in case "$(uname)" in
......
...@@ -608,6 +608,7 @@ nightly-i386-windows-hadrian: ...@@ -608,6 +608,7 @@ nightly-i386-windows-hadrian:
python boot 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 './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 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 -j`mk/detect-cpu-count.sh`"
- bash -c "PATH=`pwd`/toolchain/bin:$PATH make binary-dist TAR_COMP_OPTS=-1" - 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' - bash -c 'make V=0 test THREADS=`mk/detect-cpu-count.sh` JUNIT_FILE=../../junit.xml'
......
SRC_HC_OPTS = -O -H64m SRC_HC_OPTS = -O -H64m
GhcStage1HcOpts = -O2 GhcStage1HcOpts = -O2
GhcStage2HcOpts = -O2 GhcStage2HcOpts = -O2
GhcLibHcOpts = -O2 -haddock GhcLibHcOpts = -O2
BUILD_PROF_LIBS = YES BUILD_PROF_LIBS = YES
#HADDOCK_DOCS #HADDOCK_DOCS
#BUILD_SPHINX_HTML #BUILD_SPHINX_HTML
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment