[commit: ghc] wip/angerman/llvmng: Yuck! (429a426)

[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/429a426fdd2e559294815cfa94a1d8498edcad99/ghc

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

commit 429a426fdd2e559294815cfa94a1d8498edcad99
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Mon Oct 23 22:22:03 2017 +0800

    Yuck!


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

429a426fdd2e559294815cfa94a1d8498edcad99
 distrib/configure.ac.in | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 4e71c92..e3b2c74 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -23,7 +23,6 @@ dnl--------------------------------------------------------------------
 FP_GMP
 
 dnl Various things from the source distribution configure
-bootstrap_target=@TargetPlatform@
 
 HaskellHaveRTSLinker=@HaskellHaveRTSLinker@
 AC_SUBST(HaskellHaveRTSLinker)
@@ -40,16 +39,18 @@ TargetPlatformFull=@TargetPlatformFull@
 # when cross compiling, retain the build/host/target values
 # from the initial configure step; while still allowing to set
 # them via `--build/--host/--target` if need be.
-if test "x$CrossCompiling" = "xNO"; then
-   if text -z "$build_alias"; then
+if test "x$CrossCompiling" = "xYES"; then
+   if test -z "$build_alias"; then
       build_alias=@build_alias@
    fi
    if test -z "$host_alias"; then
       host_alias=@host_alias@
    fi
-   if text -z "$target_alias"; then
+   if test -z "$target_alias"; then
       target_alias=@target_alias@
    fi
+else
+   bootstrap_target=@TargetPlatform@
 fi
 
 # We have to run these unconditionally as FPTOOLS_SET_PLATFORM_VARS wants the
@@ -58,8 +59,8 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-FPTOOLS_SET_PLATFORM_VARS
-
+# FP_FIND_ROOT requires knowledge about $windows; inherit it.
+windows=@windows@
 FP_FIND_ROOT
 
 AC_SUBST(CrossCompiling)
@@ -160,6 +161,15 @@ AC_SUBST(CONF_CPP_OPTS_STAGE0)
 AC_SUBST(CONF_CPP_OPTS_STAGE1)
 AC_SUBST(CONF_CPP_OPTS_STAGE2)
 
+
+dnl ** Hack tools for cross compilers
+dnl --------------------------------------------------------------
+dnl When building a binary distribution for cross compilers,
+dnl we likely want to retain the target-prefixed tools, and not
+dnl have configure overwrite them with what ever it finds, as
+dnl the found tools likely do not target the target.
+
+if test "x$CrossCompiling" = "xNO"; then
 dnl ** Which ld to use?
 dnl --------------------------------------------------------------
 FIND_LD([$target],[GccUseLdOpt])
@@ -219,17 +229,10 @@ if test "x$BinDistNeedsLibdw" = "xYES" ; then
 fi
 
 FP_SETTINGS
+AC_CONFIG_FILES(settings)
+fi # end CrossCompiling == NO
 
-dnl ** Hack tools for cross compilers
-dnl --------------------------------------------------------------
-dnl When building a binary distribution for cross compilers,
-dnl we likely want to retain the target-prefixed tools, and not
-dnl have configure overwrite them with what ever it finds, as
-dnl the found tools likely do not target the target.
 AC_CONFIG_FILES(mk/config.mk mk/install.mk)
-if test "x$CrossCompiling" = "xNO"; then
-AC_CONFIG_FILES(settings)
-fi
 
 AC_OUTPUT