summaryrefslogtreecommitdiff
path: root/distrib/configure.ac.in
diff options
context:
space:
mode:
authorThomas Miedema <thomasmiedema@gmail.com>2016-01-08 20:59:28 +0100
committerThomas Miedema <thomasmiedema@gmail.com>2016-01-08 23:46:36 +0100
commitf7b45c31f07daa4c3dca39f6ccc1a52c86900b7c (patch)
tree208a16b18369b65ee6f9725cf69ace50b5777a82 /distrib/configure.ac.in
parent2bd05b889f39e5ddf43a723b817b92fc6f4fc6d4 (diff)
downloadhaskell-f7b45c31f07daa4c3dca39f6ccc1a52c86900b7c.tar.gz
Build system: fix `pwd` issues on Windows
Some parts of the build system require that paths are what msys2 calls "mixed style": * forwards slashes * absolute paths starting with a drive letter followed by a colon (e.g. "C:") The removal of ghc-pwd in 4c56ad3 changed $(TOP) from mixed style to unix style, resulting in a broken Windows build for some. Differential Revision: https://phabricator.haskell.org/D1752
Diffstat (limited to 'distrib/configure.ac.in')
-rw-r--r--distrib/configure.ac.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index 4d57cd8545..99b51f536b 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -6,8 +6,6 @@ dnl
AC_INIT([The Glorious Glasgow Haskell Compilation System], [@ProjectVersion@], [glasgow-haskell-bugs@haskell.org], [ghc])
-FP_FIND_ROOT
-
dnl--------------------------------------------------------------------
dnl * Deal with arguments telling us gmp is somewhere odd
dnl--------------------------------------------------------------------
@@ -17,6 +15,9 @@ FP_GMP
bootstrap_target=@TargetPlatform@
FPTOOLS_SET_PLATFORM_VARS
+# Requires FPTOOLS_SET_PLATFORM_VARS to be run first.
+FP_FIND_ROOT
+
# ToDo: if Stage1Only=YES, should be YES
CrossCompiling=NO
CrossCompilePrefix=""