From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Fri, 30 Nov 2018 10:11:18 +0000 (+0000)
Subject: use-stage1-binaries-for-install
X-Git-Tag: archive/raspbian/8.4.4+dfsg1-1+rpi1^2~11
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=33ce134523b87ff41a897e778608c9b924b1d7a9;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 08d4c054..03b4eb39 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -972,8 +972,12 @@ else # CrossCompiling
 # 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