diff options
| author | Ian Lynagh <igloo@earth.li> | 2012-03-15 15:53:12 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2012-03-15 15:57:14 +0000 |
| commit | dad672f3c37011f084938ce9e0afddeaa4692d89 (patch) | |
| tree | f04998d605e7b9a09c5dcf32fa05810c47551037 /aclocal.m4 | |
| parent | 1d00c8393d8b9cd8a2fc8ad4c10bb04e8febabdf (diff) | |
| download | haskell-dad672f3c37011f084938ce9e0afddeaa4692d89.tar.gz | |
More aclocal fixes for Win64
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 666715cba4..f4a470a826 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" |