Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/dad672f3c37011f084938ce9e0afddeaa4692d89 >--------------------------------------------------------------- commit dad672f3c37011f084938ce9e0afddeaa4692d89 Author: Ian Lynagh <[email protected]> Date: Thu Mar 15 15:53:12 2012 +0000 More aclocal fixes for Win64 >--------------------------------------------------------------- aclocal.m4 | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 666715c..f4a470a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -363,12 +363,18 @@ AC_DEFUN([FP_SETTINGS], [ if test "$windows" = YES then - SettingsCCompilerCommand='$topdir/../mingw/bin/gcc.exe' + if test "$HostOS" = "x86_64" + then + mingw_bin_prefix=x86_64-w64-mingw32- + else + mingw_bin_prefix= + fi + SettingsCCompilerCommand="\$topdir/../mingw/bin/${mingw_bin_prefix}gcc.exe" SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2" - SettingsArCommand='$topdir/../mingw/bin/ar.exe' + SettingsArCommand="\$topdir/../mingw/bin/${mingw_bin_prefix}ar.exe" SettingsPerlCommand='$topdir/../perl/perl.exe' - SettingsDllWrapCommand='$topdir/../mingw/bin/dllwrap.exe' - SettingsWindresCommand='$topdir/../mingw/bin/windres.exe' + SettingsDllWrapCommand="\$topdir/../mingw/bin/${mingw_bin_prefix}dllwrap.exe" + SettingsWindresCommand="\$topdir/../mingw/bin/${mingw_bin_prefix}windres.exe" SettingsTouchCommand='$topdir/touchy.exe' else SettingsCCompilerCommand="$WhatGccIsCalled" _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
