summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorFangrui Song <i@maskray.me>2017-04-20 17:03:30 -0700
committerSergei Trofimovich <slyfox@gentoo.org>2017-04-21 22:32:22 +0100
commit32a5ba993de4a8c88d4738d7386ba8afbaa84e78 (patch)
tree93decfa56c97455603e9807560e430b5e4918785 /ghc.mk
parentf0751d9bedbe293af0dedecf63e65524fd4fda7f (diff)
downloadhaskell-32a5ba993de4a8c88d4738d7386ba8afbaa84e78.tar.gz
Build system: fix bindist for cross-build GHC
The change fixes case of installing cross-built GHC from bindist (BINDIST=YES) on TARGET. In this case we need to use TARGET tools in `INSTALLED_GHC{,_PKG}_REAL`. The original change is provided by Fangrui Song as pull request https://github.com/ghc/ghc/pull/34 Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/ghc.mk b/ghc.mk
index 8971f25981..d1dbb9eb4f 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -962,7 +962,7 @@ endif
INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d
-ifeq "$(CrossCompiling)" "YES"
+ifeq "$(BINDIST) $(CrossCompiling)" "NO YES"
# when installing ghc-stage2 we can't run target's
# 'ghc-pkg' and 'ghc-stage2' but those are needed for registration.
INSTALLED_GHC_REAL=$(TOP)/inplace/bin/ghc-stage1