From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Tue, 29 Aug 2017 21:10:26 +0000 (+0100)
Subject: use-stage1-binaries-for-install
X-Git-Tag: archive/raspbian/8.0.2-10+rpi1^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4c331299a192cc7c1f7ccffa431e7f898d302b7a;p=ghc.git

use-stage1-binaries-for-install


Gbp-Pq: Name use-stage1-binaries-for-install.patch
---

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