X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=8593b897888fe4512441b75bba740062cdebf1dd;hb=0e3cc7448cd966c1463adc4685b7d8646dccd0ed;hp=df7db2c3de7d021ddb5e6f732a0888d5446ee94c;hpb=beabed20fb6b72eb79fcf315b1793ff8da415653;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index df7db2c..8593b89 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -268,6 +268,16 @@ dnl for a happy source tree and point the build system at that instead.
 dnl
 AC_DEFUN([FPTOOLS_HAPPY],
 [AC_PATH_PROG(HappyCmd,happy,)
+# Happy is passed to Cabal, so we need a native path
+if test "x$HostPlatform"  = "xi386-unknown-mingw32" && \
+   test "${OSTYPE}"      != "msys"                  && \
+   test "${HappyCmd}"    != ""
+then
+    # Canonicalise to <drive>:/path/to/gcc
+    HappyCmd=`cygpath -m ${HappyCmd}`
+    AC_MSG_NOTICE([normalized happy command to $HappyCmd])
+fi
+
 AC_CACHE_CHECK([for version of happy], fptools_cv_happy_version,
 changequote(, )dnl
 [if test x"$HappyCmd" != x; then