Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Chaitanya Koparkar
GHC
Commits
897a7d97
Commit
897a7d97
authored
Sep 03, 2010
by
Ian Lynagh
Browse files
Don't haddock packages that we aren't going to install
parent
dbd4b569
Changes
2
Hide whitespace changes
Inline
Side-by-side
ghc.mk
View file @
897a7d97
...
...
@@ -312,6 +312,10 @@ define addPackage # args: $1 = package, $2 = condition
endif
endef
INTREE_ONLY_PACKAGES
:=
haskeline mtl terminfo utf8-string xhtml
$(foreach
p,$(INTREE_ONLY_PACKAGES),$(eval
libraries/
$p_dist-install_HADDOCK_ME
=
NO
))
$(eval
$(call
addPackage,ghc-prim))
ifeq
"$(CLEANING)" "YES"
$(eval
$(call
addPackage,integer-gmp))
...
...
@@ -897,7 +901,7 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
INSTALLED_GHC_PKG_REAL
=
$(DESTDIR)$(bindir)
/ghc-pkg.exe
endif
INSTALLED_PACKAGES
:=
$(
filter-out
haskeline mtl terminfo utf8-string xhtml
,
$(PACKAGES)
)
INSTALLED_PACKAGES
:=
$(
filter-out
$(INTREE_ONLY_PACKAGES)
,
$(PACKAGES)
)
ifeq
"$(InstallExtraPackages)" "NO"
INSTALLED_PACKAGES
:=
$(
filter-out
$(EXTRA_PACKAGES)
,
$(INSTALLED_PACKAGES)
)
endif
...
...
rules/build-package.mk
View file @
897a7d97
...
...
@@ -161,7 +161,9 @@ $$(foreach way,$$($1_$2_WAYS),$$(eval \
$$(call
build-package-way,$1,$2,$$(way),$3)
\
))
ifneq
"$$($1_$2_HADDOCK_ME)" "NO"
$(call
haddock,$1,$2)
endif
endif
# package-data.mk exists
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment