diff options
| author | Ian Lynagh <ian@well-typed.com> | 2013-04-20 16:21:29 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-04-20 17:37:12 +0100 |
| commit | 763156287c6833caaa927338225273d910c11770 (patch) | |
| tree | ba183e6b9ef3b0850d3f0fa0f29c88e28fc558a6 /ghc.mk | |
| parent | a8de9248076644246ef1793041c0d8a80f58b50d (diff) | |
| download | haskell-763156287c6833caaa927338225273d910c11770.tar.gz | |
Fix haddocking
We weren't seting the _DO_HADDOCK variables early enough.
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -500,6 +500,11 @@ endif # -------------------------------- # Misc package-related settings +# Run Haddock for the packages that will be installed. We need to handle +# compiler specially due to the different dist directory name. +$(foreach p,$(INSTALL_PACKAGES),$(eval $p_dist-install_DO_HADDOCK = YES)) +compiler_stage2_DO_HADDOCK = YES + BOOT_PKG_CONSTRAINTS := \ $(foreach d,$(PACKAGES_STAGE0),\ $(foreach p,$(basename $(notdir $(wildcard libraries/$d/*.cabal))),\ @@ -733,11 +738,6 @@ endif # ----------------------------------------------- # Haddock-related bits -# Run Haddock for the packages that will be installed. We need to handle -# compiler specially due to the different dist directory name. -$(foreach p,$(INSTALL_PACKAGES),$(eval $p_dist-install_DO_HADDOCK = YES)) -compiler_stage2_DO_HADDOCK = YES - # Build the Haddock contents and index ifeq "$(HADDOCK_DOCS)" "YES" libraries/dist-haddock/index.html: $(haddock_INPLACE) $(ALL_HADDOCK_FILES) |