From 96ab3dc566c8bef443285b3aeccd018102cb6cd7 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 20 Sep 2023 00:00:36 +0100 Subject: [PATCH] Use the stage1 binaries for install Last-Update: 2017-01-29 In order to be able to perform a cross-build, we need to use the stage1 binaries during installation. Both ghc and ghc-pkg are run during the install target and therefore must be able to run on the build machine. 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 dcee2345..5ea6e601 100644 --- a/ghc.mk +++ b/ghc.mk @@ -952,8 +952,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 -- 2.30.2