diff options
| author | Ian Lynagh <ian@well-typed.com> | 2012-08-05 18:08:22 +0100 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2012-08-05 18:08:22 +0100 |
| commit | 2d2650bf65da3aede4e1c1ca4da623092b869dbe (patch) | |
| tree | 9e99da26009e15aa9ece123ded307d150d37c102 /aclocal.m4 | |
| parent | ecc43c17c87fed9221851ed6c6fa4a8b8967b20e (diff) | |
| download | haskell-2d2650bf65da3aede4e1c1ca4da623092b869dbe.tar.gz | |
Move linker flags into the settings file; fixes #4862
They were getting baked into Config.hs before.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index a43b24ae36..c2eb103010 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -365,7 +365,6 @@ AC_DEFUN([FP_SETTINGS], then mingw_bin_prefix=mingw/bin/ SettingsCCompilerCommand="\$topdir/../${mingw_bin_prefix}gcc.exe" - SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2" SettingsArCommand="\$topdir/../${mingw_bin_prefix}ar.exe" SettingsPerlCommand='$topdir/../perl/perl.exe' SettingsDllWrapCommand="\$topdir/../${mingw_bin_prefix}dllwrap.exe" @@ -373,7 +372,6 @@ AC_DEFUN([FP_SETTINGS], SettingsTouchCommand='$topdir/touchy.exe' else SettingsCCompilerCommand="$WhatGccIsCalled" - SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2" SettingsArCommand="$ArCmd" SettingsPerlCommand="$PerlCmd" SettingsDllWrapCommand="/bin/false" @@ -392,8 +390,11 @@ AC_DEFUN([FP_SETTINGS], SettingsOptCommand="$OptCmd" fi fi + SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 $CONF_GCC_LINKER_OPTS_STAGE2" + SettingsLdFlags="$CONF_LD_LINKER_OPTS_STAGE2" AC_SUBST(SettingsCCompilerCommand) AC_SUBST(SettingsCCompilerFlags) + AC_SUBST(SettingsLdFlags) AC_SUBST(SettingsArCommand) AC_SUBST(SettingsPerlCommand) AC_SUBST(SettingsDllWrapCommand) |