X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=aclocal.m4;h=858a3f0a6cc2fa6c458cfd205904ef27a5d2e56d;hb=44deb23d9a1e9a28554f26eed85e76cb1c77220e;hp=d0ba4bfe54886634ecd46a6a17265800e2f09c24;hpb=ff4bec32992c3e225bc94b29202d6a921996939e;p=ghc-hetmet.git

diff --git a/aclocal.m4 b/aclocal.m4
index d0ba4bf..858a3f0 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -363,6 +363,12 @@ case $HostPlatform in
  	      LdCmd="`cygpath -w ${fp_prog_ld_raw} | sed -e 's@\\\\@/@g'`"
               AC_MSG_NOTICE([normalized ld command to $LdCmd])
             fi
+	    # Insist on >= ld-2.15.x, since earlier versions doesn't handle
+	    # the generation of relocatable object files with large amounts
+	    # of relocations correctly. (cf. HSbase.o splittage-hack)
+	    fp_prog_ld_version=`${LdCmd} --version | sed -n '/GNU ld/p' | tr -cd 0-9 | cut -b1-3`
+	    FP_COMPARE_VERSIONS([$fp_prog_ld_version],[-lt],[214],
+                                [AC_MSG_ERROR([GNU ld version later than 2.14 required to compile GHC on Windows.])])[]dnl
             ;;
 esac
 AC_SUBST([LdCmd])
@@ -822,8 +828,8 @@ main() {
   exit(0);
 }]])],[AC_CV_NAME=`cat conftestval`],
 [ifelse([$2], , [AC_CV_NAME=NotReallyAType; AC_CV_NAME_supported=no], [AC_CV_NAME=$2])],
-[ifelse([$3], , [AC_CV_NAME=NotReallyATypeCross; AC_CV_NAME_supported=no], [AC_CV_NAME=$3])])]) dnl
-CPPFLAGS="$fp_check_htype_save_cppflags"
+[ifelse([$3], , [AC_CV_NAME=NotReallyATypeCross; AC_CV_NAME_supported=no], [AC_CV_NAME=$3])])
+CPPFLAGS="$fp_check_htype_save_cppflags"]) dnl
 if test "$AC_CV_NAME_supported" = yes; then
   AC_MSG_RESULT($AC_CV_NAME)
   AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [Define to Haskell type for $1])