[commit: ghc] master: Build system: fix bindist for cross-build GHC (32a5ba9)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/32a5ba993de4a8c88d4738d7386ba8afbaa84e78/ghc

>---------------------------------------------------------------

commit 32a5ba993de4a8c88d4738d7386ba8afbaa84e78
Author: Fangrui Song <i at maskray.me>
Date:   Thu Apr 20 17:03:30 2017 -0700

    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 at gentoo.org>


>---------------------------------------------------------------

32a5ba993de4a8c88d4738d7386ba8afbaa84e78
 ghc.mk          | 2 +-
 mk/config.mk.in | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 8971f25..d1dbb9e 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
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 1f7353c..8901137 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -415,6 +415,7 @@ GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64), at UseLibdw@,
 #
 ################################################################################
 
+BINDIST               = NO
 BIN_DIST_NAME         = ghc-$(ProjectVersion)
 BIN_DIST_PREP_DIR     = bindistprep/$(BIN_DIST_NAME)
 BIN_DIST_PREP_TAR     = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar