[commit: ghc] wip/angerman/llvmng: Merge branch 'feature/cross-compiler-bindist' into wip/angerman/llvmng (e534f8d)

[git at git.haskell.org]

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

On branch  : wip/angerman/llvmng
Link       : http://ghc.haskell.org/trac/ghc/changeset/e534f8d2158d8e5075c12724411b56335e98b806/ghc

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

commit e534f8d2158d8e5075c12724411b56335e98b806
Merge: e602a6d 67ab675c
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Tue Oct 3 09:17:15 2017 +0800

    Merge branch 'feature/cross-compiler-bindist' into wip/angerman/llvmng
    
    # Conflicts:
    #	ghc.mk



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

e534f8d2158d8e5075c12724411b56335e98b806
 distrib/configure.ac.in | 19 ++++++++++++++-----
 ghc.mk                  | 13 ++++++++++---
 2 files changed, 24 insertions(+), 8 deletions(-)