diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2010-03-30 14:27:14 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2010-03-30 14:27:14 +0000 |
| commit | f96ea257527704ac24b2f619018de7ed5dc7c84d (patch) | |
| tree | 0afc1b3feb71f50567f114069673235e858a20fc | |
| parent | 07308413a4b20e70c294b657006327b09b65cfc0 (diff) | |
| download | haskell-f96ea257527704ac24b2f619018de7ed5dc7c84d.tar.gz | |
Don't install EXTRA_PACKAGES by default
| -rw-r--r-- | ghc.mk | 6 | ||||
| -rw-r--r-- | mk/config.mk.in | 10 |
2 files changed, 15 insertions, 1 deletions
@@ -857,7 +857,11 @@ 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,$(PACKAGES)) +INSTALLED_PACKAGES := $(filter-out haskeline mtl terminfo utf8-string,$(PACKAGES)) +ifeq "$(InstallExtraPackages)" "NO" +INSTALLED_PACKAGES := $(filter-out $(EXTRA_PACKAGES), $(INSTALLED_PACKAGES)) +endif + HIDDEN_PACKAGES = binary define set_INSTALL_DISTDIR diff --git a/mk/config.mk.in b/mk/config.mk.in index 111de23810..8df8e2101f 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -302,6 +302,16 @@ SupportsSplitObjs=$(strip $(if $(filter YES,$(ArchSupportsSplitObjs)),\ # By default, enable SplitObjs for the libraries if this build supports it SplitObjs=$(SupportsSplitObjs) +# ---------------------------------------------------------------------------- +# Package-related things + +# Extra packages to add to the build, in dependency order +EXTRA_PACKAGES = + +# Whether to install $(EXTRA_PACKAGES) +InstallExtraPackages = NO + +# Run "ghc-pkg check" on each package CHECK_PACKAGES = NO # ---------------------------------------------------------------------------- |