summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.circleci/prepare-system.sh1
-rw-r--r--.gitlab-ci.yml1
-rw-r--r--mk/flavours/perf.mk2
3 files changed, 3 insertions, 1 deletions
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh
index 804e0fd890..fbbb81b260 100755
--- a/.circleci/prepare-system.sh
+++ b/.circleci/prepare-system.sh
@@ -30,6 +30,7 @@ BuildFlavour=$BUILD_FLAVOUR
ifneq "\$(BuildFlavour)" ""
include mk/flavours/\$(BuildFlavour).mk
endif
+GhcLibHcOpts+=-haddock
EOF
case "$(uname)" in
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9b2a42872..ab88747b69 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -608,6 +608,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'
diff --git a/mk/flavours/perf.mk b/mk/flavours/perf.mk
index 93c5919b59..ee856626ad 100644
--- a/mk/flavours/perf.mk
+++ b/mk/flavours/perf.mk
@@ -1,7 +1,7 @@
SRC_HC_OPTS = -O -H64m
GhcStage1HcOpts = -O2
GhcStage2HcOpts = -O2
-GhcLibHcOpts = -O2 -haddock
+GhcLibHcOpts = -O2
BUILD_PROF_LIBS = YES
#HADDOCK_DOCS
#BUILD_SPHINX_HTML