Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ee250e51d9677c7282a8a4f64d1082e5e55a9af6 >--------------------------------------------------------------- commit ee250e51d9677c7282a8a4f64d1082e5e55a9af6 Author: Ian Lynagh <[email protected]> Date: Sat Jan 14 22:04:34 2012 +0000 When configuring, handle $topdir/ in the ghc --info output It might make more sense for there to be a way to get the "ghc --info" output with $topdir already expanded, but in the mean time this gets things working again. >--------------------------------------------------------------- aclocal.m4 | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 8f9f4c3..8318452 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1944,6 +1944,12 @@ AC_DEFUN([BOOTSTRAPPING_GHC_INFO_FIELD],[ if test $GhcCanonVersion -ge 701 then $1=`"$WithGhc" --info | grep "^ ,(\"$2\"," | sed -e 's/.*","//' -e 's/")$//'` + tmp=${$1#\$topdir/} + if test "${$1}" != "$tmp" + then + topdir=`"$WithGhc" --print-libdir | sed 's#\\\\#/#g'` + $1="$topdir/$tmp" + fi else $1=$3 fi _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
