diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-18 19:40:40 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-21 01:35:54 +0200 |
| commit | 13ba87f8a28154e33b5b6d6b8302e18f7c56760b (patch) | |
| tree | 2356f3d28b0aa5a8507b8967557453fdfc277288 | |
| parent | 15ef5fcb63cb8e3a7137490af04b84103e3a1e0d (diff) | |
| download | haskell-13ba87f8a28154e33b5b6d6b8302e18f7c56760b.tar.gz | |
Build system: unset HADDOCK when haddock is not found
This prevents the following test errors on Windows:
perf/haddock haddock.Cabal [[Errno 2] No such file or directory: ...
perf/haddock haddock.base [[Errno 2] No such file or directory: ...
perf/haddock haddock.compiler [[Errno 2] No such file or directory: ...
The tests will now be reported as having missing libraries.
| -rw-r--r-- | testsuite/mk/boilerplate.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk index d5b7fb5b14..b5039d5583 100644 --- a/testsuite/mk/boilerplate.mk +++ b/testsuite/mk/boilerplate.mk @@ -143,8 +143,8 @@ endif $(eval $(call canonicaliseExecutable,HADDOCK)) ifeq "$(shell test -x '$(HADDOCK)' && echo exists)" "" -# haddock is optional. -HADDOCK := +# haddock is optional. Use 'override' to override canonicalise's override... +override HADDOCK := endif $(eval $(call canonicaliseExecutable,HSC2HS)) |