diff options
| author | John Ericson <git@JohnEricson.me> | 2019-04-03 09:32:05 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-04-30 20:29:31 -0400 |
| commit | d37d91e9a444a7822eef1558198d21511558515e (patch) | |
| tree | 478d7a0bf63e91ac8901f0c277dbe29136b1665b /aclocal.m4 | |
| parent | 014ed644eea9037427c1ebeaac16189b00f9dbc7 (diff) | |
| download | haskell-d37d91e9a444a7822eef1558198d21511558515e.tar.gz | |
Generate settings by make/hadrian instead of configure
This allows it to eventually become stage-specific
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index d2d42f243b..5004a05ec6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -497,16 +497,16 @@ AC_DEFUN([FP_SETTINGS], [ if test "$windows" = YES -a "$EnableDistroToolchain" = "NO" then - mingw_bin_prefix=mingw/bin/ - SettingsCCompilerCommand="\$tooldir/${mingw_bin_prefix}gcc.exe" - SettingsHaskellCPPCommand="\$tooldir/${mingw_bin_prefix}gcc.exe" + mingw_bin_prefix='$$tooldir/mingw/bin/' + SettingsCCompilerCommand="${mingw_bin_prefix}gcc.exe" + SettingsHaskellCPPCommand="${mingw_bin_prefix}gcc.exe" SettingsHaskellCPPFlags="$HaskellCPPArgs" - SettingsLdCommand="\$tooldir/${mingw_bin_prefix}ld.exe" - SettingsArCommand="\$tooldir/${mingw_bin_prefix}ar.exe" - SettingsRanlibCommand="\$tooldir/${mingw_bin_prefix}ranlib.exe" - SettingsDllWrapCommand="\$tooldir/${mingw_bin_prefix}dllwrap.exe" - SettingsWindresCommand="\$tooldir/${mingw_bin_prefix}windres.exe" - SettingsTouchCommand='$topdir/bin/touchy.exe' + SettingsLdCommand="${mingw_bin_prefix}ld.exe" + SettingsArCommand="${mingw_bin_prefix}ar.exe" + SettingsRanlibCommand="${mingw_bin_prefix}ranlib.exe" + SettingsDllWrapCommand="${mingw_bin_prefix}dllwrap.exe" + SettingsWindresCommand="${mingw_bin_prefix}windres.exe" + SettingsTouchCommand='$$topdir/bin/touchy.exe' elif test "$EnableDistroToolchain" = "YES" then SettingsCCompilerCommand="$(basename $CC)" @@ -517,7 +517,7 @@ AC_DEFUN([FP_SETTINGS], SettingsArCommand="$(basename $ArCmd)" SettingsDllWrapCommand="$(basename $DllWrapCmd)" SettingsWindresCommand="$(basename $WindresCmd)" - SettingsTouchCommand='$topdir/bin/touchy.exe' + SettingsTouchCommand='$$topdir/bin/touchy.exe' else SettingsCCompilerCommand="$CC" SettingsHaskellCPPCommand="$HaskellCPPCmd" |