diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2008-11-10 13:43:18 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2008-11-10 13:43:18 +0000 |
| commit | e580dd581da9e9549d6fc6e09a8ac164863a96d0 (patch) | |
| tree | 1141fbc153044e21dffbc572cd7c0d188c5ef23a /aclocal.m4 | |
| parent | 3cb941fc1deb59a07be690b7ebb1b45da189f7d2 (diff) | |
| download | haskell-e580dd581da9e9549d6fc6e09a8ac164863a96d0.tar.gz | |
Fix bootstrap with 6.10.1 on Windows
ghc-pkg doesn't understand the old syntax any more, so 'ghc-pkg -l' fails
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index c49271d553..18af870f0b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -927,6 +927,9 @@ AC_DEFUN([FP_PROG_GHC_PKG], [fp_ghc_pkg_guess=`echo $WithGhc | sed 's,ghc\(@<:@^/\\@:>@*\)$,ghc-pkg\1,'` if "$fp_ghc_pkg_guess" -l > /dev/null 2>&1; then fp_cv_matching_ghc_pkg=$fp_ghc_pkg_guess +elif "$fp_ghc_pkg_guess" list > /dev/null 2>&1; then + # from 6.10, ghc-pkg doesn't support the old -l syntax any more + fp_cv_matching_ghc_pkg=$fp_ghc_pkg_guess else fp_cv_matching_ghc_pkg=no fi]) |