From 8cf9fa0a4d7dd5b584320127a81a87097c276a13 Mon Sep 17 00:00:00 2001 From: Debian Haskell Group Date: Tue, 6 Feb 2018 21:01:18 +0000 Subject: [PATCH] use-stage1-binaries-for-install Gbp-Pq: Name use-stage1-binaries-for-install.patch --- ghc.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc.mk b/ghc.mk index b3a4e027..63b946e6 100644 --- a/ghc.mk +++ b/ghc.mk @@ -958,8 +958,12 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d # Install packages in the right order, so that ghc-pkg doesn't complain. # Also, install ghc-pkg first. ifeq "$(Windows_Host)" "NO" -INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc -INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg +# Use the inplace/stage1 versions for installation, +# since the installed versions are built for the target +#INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc +#INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/bin/ghc-pkg +INSTALLED_GHC_REAL=$(CURDIR)/inplace/bin/ghc-stage1 +INSTALLED_GHC_PKG_REAL=$(CURDIR)/utils/ghc-pkg/dist/build/tmp/ghc-pkg else INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc.exe INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe -- 2.30.2