[commit: ghc] master: Build system: unset HADDOCK when haddock is not found (13ba87f)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/13ba87f8a28154e33b5b6d6b8302e18f7c56760b/ghc

>---------------------------------------------------------------

commit 13ba87f8a28154e33b5b6d6b8302e18f7c56760b
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Jun 18 19:40:40 2015 +0200

    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.


>---------------------------------------------------------------

13ba87f8a28154e33b5b6d6b8302e18f7c56760b
 testsuite/mk/boilerplate.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk
index d5b7fb5..b5039d5 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))