diff options
| author | Takenobu Tani <takenobu.hs@gmail.com> | 2019-04-14 21:31:05 +0900 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-06-12 08:39:41 -0400 |
| commit | ca7173a9902184d4f76957765a352715d75c2670 (patch) | |
| tree | 9b56930632e4cc7f4212acf2c70d54f4d2953f10 | |
| parent | b51f9ecd131d76431617a2371d497600711e724b (diff) | |
| download | haskell-wip/backport-MR769.tar.gz | |
Add `-haddock` to prepare-system.sh and .gitlab-ci.ymlwip/backport-MR769
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)
| -rwxr-xr-x | .circleci/prepare-system.sh | 1 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | mk/flavours/perf.mk | 2 |
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 4b54f28f6d..86192d8195 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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' diff --git a/mk/flavours/perf.mk b/mk/flavours/perf.mk index 93389b4b37..06fcc246da 100644 --- a/mk/flavours/perf.mk +++ b/mk/flavours/perf.mk @@ -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 |