projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
86ffe1a
)
Pass --no-tmp-comp-dir to Haddock (see comment)
author
Simon Marlow
<marlowsd@gmail.com>
Fri, 4 Jun 2010 08:32:14 +0000
(08:32 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Fri, 4 Jun 2010 08:32:14 +0000
(08:32 +0000)
rules/haddock.mk
patch
|
blob
|
history
diff --git
a/rules/haddock.mk
b/rules/haddock.mk
index
295db94
..
0008443
100644
(file)
--- a/
rules/haddock.mk
+++ b/
rules/haddock.mk
@@
-44,6
+44,7
@@
ifeq "$$(HSCOLOUR_SRCS)" "YES"
endif
"$$(TOP)/$$(INPLACE_BIN)/haddock" \
--odir="$1/$2/doc/html/$$($1_PACKAGE)" \
endif
"$$(TOP)/$$(INPLACE_BIN)/haddock" \
--odir="$1/$2/doc/html/$$($1_PACKAGE)" \
+ --no-tmp-comp-dir \
--dump-interface=$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) \
--html \
--title="$$($1_PACKAGE)-$$($1_$2_VERSION)$$(if $$(strip $$($1_$2_SYNOPSIS)),: $$(strip $$($1_$2_SYNOPSIS)),)" \
--dump-interface=$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) \
--html \
--title="$$($1_PACKAGE)-$$($1_$2_VERSION)$$(if $$(strip $$($1_$2_SYNOPSIS)),: $$(strip $$($1_$2_SYNOPSIS)),)" \
@@
-55,6
+56,12
@@
endif
$$($1_$2_HS_SRCS) \
$$($1_$2_EXTRA_HADDOCK_SRCS)
$$($1_$2_HS_SRCS) \
$$($1_$2_EXTRA_HADDOCK_SRCS)
+# --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
+# for the package rather than rebuilding the modules of the package in
+# a temporary directory. Haddock needs to build the package when it
+# uses the Template Haskell or Annotations extensions, for example.
+
# Make the haddocking depend on the library .a file, to ensure
# that we wait until the library is fully build before we haddock it
$$($$($1_PACKAGE)_HADDOCK_FILE) : $$($1_$2_v_LIB)
# Make the haddocking depend on the library .a file, to ensure
# that we wait until the library is fully build before we haddock it
$$($$($1_PACKAGE)_HADDOCK_FILE) : $$($1_$2_v_LIB)