Commit 2ff6a174 authored by Ian Lynagh's avatar Ian Lynagh

Don't install haskeline/mtl/terminfo, and hide ghc-binary

parent 0ee6cfbe
...@@ -803,6 +803,9 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe ...@@ -803,6 +803,9 @@ INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe
INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
endif endif
INSTALLED_PACKAGES = $(filter-out haskeline mtl terminfo,$(PACKAGES))
HIDDEN_PACKAGES = ghc-binary
install_packages: install_libexecs install_packages: install_libexecs
install_packages: libffi/package.conf.install rts/package.conf.install install_packages: libffi/package.conf.install rts/package.conf.install
$(INSTALL_DIR) $(DESTDIR)$(topdir) $(INSTALL_DIR) $(DESTDIR)$(topdir)
...@@ -810,7 +813,7 @@ install_packages: libffi/package.conf.install rts/package.conf.install ...@@ -810,7 +813,7 @@ install_packages: libffi/package.conf.install rts/package.conf.install
$(INSTALL_DIR) $(INSTALLED_PACKAGE_CONF) $(INSTALL_DIR) $(INSTALLED_PACKAGE_CONF)
"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update libffi/package.conf.install
"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install "$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install
$(foreach p, $(PACKAGES) $(PACKAGES_STAGE2),\ $(foreach p, $(INSTALLED_PACKAGES) $(PACKAGES_STAGE2),\
"$(GHC_CABAL_INPLACE)" install \ "$(GHC_CABAL_INPLACE)" install \
$(INSTALLED_GHC_REAL) \ $(INSTALLED_GHC_REAL) \
$(INSTALLED_GHC_PKG_REAL) \ $(INSTALLED_GHC_PKG_REAL) \
...@@ -818,6 +821,9 @@ install_packages: libffi/package.conf.install rts/package.conf.install ...@@ -818,6 +821,9 @@ install_packages: libffi/package.conf.install rts/package.conf.install
libraries/$p dist-install \ libraries/$p dist-install \
'$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \ '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' \
$(RelocatableBuild) &&) true $(RelocatableBuild) &&) true
$(foreach p, $(HIDDEN_PACKAGES),\
$(INSTALLED_GHC_PKG_REAL) --global-conf $(INSTALLED_PACKAGE_CONF) \
hide $p &&) true
"$(GHC_CABAL_INPLACE)" install \ "$(GHC_CABAL_INPLACE)" install \
$(INSTALLED_GHC_REAL) \ $(INSTALLED_GHC_REAL) \
$(INSTALLED_GHC_PKG_REAL) \ $(INSTALLED_GHC_PKG_REAL) \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment