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:
0730841
)
Don't install EXTRA_PACKAGES by default
author
Simon Marlow
<marlowsd@gmail.com>
Tue, 30 Mar 2010 14:27:14 +0000
(14:27 +0000)
committer
Simon Marlow
<marlowsd@gmail.com>
Tue, 30 Mar 2010 14:27:14 +0000
(14:27 +0000)
ghc.mk
patch
|
blob
|
history
mk/config.mk.in
patch
|
blob
|
history
diff --git
a/ghc.mk
b/ghc.mk
index
69bb286
..
f8f0937
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-857,7
+857,11
@@
INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
endif
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
HIDDEN_PACKAGES = binary
define set_INSTALL_DISTDIR
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
111de23
..
8df8e21
100644
(file)
--- 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)
# 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
# ----------------------------------------------------------------------------
CHECK_PACKAGES = NO
# ----------------------------------------------------------------------------