summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <bgamari.foss@gmail.com>2017-07-20 11:34:00 -0400
committerBen Gamari <ben@smart-cactus.org>2017-07-20 11:34:01 -0400
commit1480080b31e9f7cd47ca7b677455b3558b0da2bc (patch)
tree932a7b9782c5f503c108c64074c3e7b92464c056
parentbade356f79d44c9f6e8918a89d9ffac7f5608dbf (diff)
downloadhaskell-1480080b31e9f7cd47ca7b677455b3558b0da2bc.tar.gz
distrib/configure: Canonicalize triples
Previously we failed to do this, which meant that the bindist's configure would fail when passed --target (as you may need to do when installing an armv7 bindist on an aarch64 machine, for instance). Reviewers: hvr, erikd, austin Reviewed By: hvr Subscribers: rwbarton, thomie GHC Trac Issues: #13934 Differential Revision: https://phabricator.haskell.org/D3761
-rw-r--r--distrib/configure.ac.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index a15b4a5a3c..314bb3a14e 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -13,6 +13,13 @@ dnl--------------------------------------------------------------------
FP_GMP
bootstrap_target=@TargetPlatform@
+
+# We have to run these unconditionally as FPTOOLS_SET_PLATFORM_VARS wants the
+# values it computes.
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
FPTOOLS_SET_PLATFORM_VARS
# Requires FPTOOLS_SET_PLATFORM_VARS to be run first.