diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-05-24 18:58:19 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-05-27 17:13:45 +0200 |
| commit | 388448bcc2e363d1913b5132a36ac7aaa20eafc0 (patch) | |
| tree | 82bc98421070aa20c845523bf7e8b6e400f6e35b | |
| parent | 71d1f01db94dda5b8c2c367fba8cc7b115b06e95 (diff) | |
| download | haskell-388448bcc2e363d1913b5132a36ac7aaa20eafc0.tar.gz | |
Build system: don't install haddock .t files (#10410)
When generating a haddock .t file for a library, don't save it in the
`dist-install/doc` directory for that library, as then it gets copied to
the installation directory during `make install` by `ghc-cabal copy`.
Instead, save it a few directories up; putting it next to
`haddock-prologue.txt` seemed appropriate.
Test Plan: run `make` in `tests/perf/haddock`.
Differential Revision: https://phabricator.haskell.org/D903
| -rw-r--r-- | rules/haddock.mk | 2 | ||||
| -rw-r--r-- | testsuite/tests/perf/haddock/all.T | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/rules/haddock.mk b/rules/haddock.mk index a7785fe134..a43df95066 100644 --- a/rules/haddock.mk +++ b/rules/haddock.mk @@ -61,7 +61,7 @@ endif $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS) \ $$($1_$2_HS_SRCS) \ $$($1_$2_EXTRA_HADDOCK_SRCS) \ - +RTS -t$$@.t --machine-readable + +RTS -t"$1/$2/haddock.t" --machine-readable # --no-tmp-comp-dir above is important: it saves a few minutes in a # validate. This flag lets Haddock use the pre-compiled object files diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T index bf2c00977d..5d1e6a04e9 100644 --- a/testsuite/tests/perf/haddock/all.T +++ b/testsuite/tests/perf/haddock/all.T @@ -40,7 +40,7 @@ test('haddock.base', # 2014-08-05: XXX TODO UPDATE ME XXX ], stats, - ['../../../../libraries/base/dist-install/doc/html/base/base.haddock.t']) + ['../../../../libraries/base/dist-install/haddock.t']) test('haddock.Cabal', [unless(in_tree_compiler(), skip), req_haddock @@ -81,7 +81,7 @@ test('haddock.Cabal', # 2014-08-05: XXX TODO UPDATE ME XXX ], stats, - ['../../../../libraries/Cabal/Cabal/dist-install/doc/html/Cabal/Cabal.haddock.t']) + ['../../../../libraries/Cabal/Cabal/dist-install/haddock.t']) test('haddock.compiler', [unless(in_tree_compiler(), skip), req_haddock @@ -109,4 +109,4 @@ test('haddock.compiler', # 2014-06-29: 15110426000 (x86/Linux) ], stats, - ['../../../../compiler/stage2/doc/html/ghc/ghc.haddock.t']) + ['../../../../compiler/stage2/haddock.t']) |