diff options
| author | Takenobu Tani <takenobu.hs@gmail.com> | 2019-04-14 19:11:12 +0900 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-06-12 08:39:41 -0400 |
| commit | b51f9ecd131d76431617a2371d497600711e724b (patch) | |
| tree | 7de11db4a78dcfdfe42a61adf9af5fbb457c9ee8 | |
| parent | c4b501b16005d35697a51a577c0a858fcf6f2be5 (diff) | |
| download | haskell-b51f9ecd131d76431617a2371d497600711e724b.tar.gz | |
Add `-haddock` to perf.mk rather than prepare-system.sh
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.
(cherry picked from commit 43a39c3c2195d5b4400efc845a54f153184b1d7f)
| -rwxr-xr-x | .circleci/prepare-system.sh | 1 | ||||
| -rw-r--r-- | mk/flavours/perf.mk | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/.circleci/prepare-system.sh b/.circleci/prepare-system.sh index ab82d4dbba..804e0fd890 100755 --- a/.circleci/prepare-system.sh +++ b/.circleci/prepare-system.sh @@ -29,7 +29,6 @@ cat <<EOF >> mk/build.mk BuildFlavour=$BUILD_FLAVOUR ifneq "\$(BuildFlavour)" "" include mk/flavours/\$(BuildFlavour).mk -GhcLibHcOpts+=-haddock endif EOF diff --git a/mk/flavours/perf.mk b/mk/flavours/perf.mk index 06fcc246da..93389b4b37 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 +GhcLibHcOpts = -O2 -haddock BUILD_PROF_LIBS = YES #SplitObjs #HADDOCK_DOCS |