[commit: ghc] wip/angerman/llvmng: No recomputation of host/build/target for binary distributions. (156fe18)

[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/156fe185d416d48e91995fa420e534a5af6ea8fb/ghc

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

commit 156fe185d416d48e91995fa420e534a5af6ea8fb
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sun Oct 22 20:33:12 2017 +0800

    No recomputation of host/build/target for binary distributions.


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

156fe185d416d48e91995fa420e534a5af6ea8fb
 aclocal.m4              | 2 ++
 distrib/configure.ac.in | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 64fa8bf..9848029 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -170,6 +170,8 @@ AC_DEFUN([FPTOOLS_SET_PLATFORM_VARS],
     AC_SUBST(exeext_target)
     AC_SUBST(soext_host)
     AC_SUBST(soext_target)
+
+    AC_SUBST(windows)
 ])
 
 
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 62f6575..9d3c2c4 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -30,9 +30,8 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-FPTOOLS_SET_PLATFORM_VARS
-
-# Requires FPTOOLS_SET_PLATFORM_VARS to be run first.
+# FP_FIND_ROOT requires knowledge about $windows; inherit it.
+windows=@windows@
 FP_FIND_ROOT
 
 CrossCompiling=@CrossCompiling@