diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2017-06-29 15:34:39 +0100 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2017-06-29 15:34:39 +0100 |
| commit | 58c781da4861faab11e4c5804e07e6892908ef72 (patch) | |
| tree | 3eee171fbd5756b479b4dab6ce7f4e3328b9d64c /aclocal.m4 | |
| parent | 3b0e7555fafe73b157a96ca48d8ddc04ad81b231 (diff) | |
| download | haskell-58c781da4861faab11e4c5804e07e6892908ef72.tar.gz | |
Revert "Remove the Windows GCC driver."
This reverts commit d6cecde585b0980ed8e0050c5a1d315789fb6356.
The patch broke Simon PJ's Windows build, becuase he didn't
have (and should not need) a separate msys2 gcc.
Following an exchange on the ghc-devs list, Tamar wrote
Oops, sorry, didn’t notice it because both mine and harbormaster’s
msys2 have separate GCCs installed as well.
I don’t see an easy fix that would also work for end user Configure
based cabal installs. So I think I’ll have to go back to the drawing
board for this one.
You can just leave it reverted.
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 40aaf9167f..db394f38d6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -464,7 +464,6 @@ AC_DEFUN([FP_SETTINGS], then mingw_bin_prefix=mingw/bin/ SettingsCCompilerCommand="\$topdir/../${mingw_bin_prefix}gcc.exe" - SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2 -B\$topdir/../mingw/bin/ -B\$topdir/../mingw/lib/" SettingsHaskellCPPCommand="\$topdir/../${mingw_bin_prefix}gcc.exe" SettingsHaskellCPPFlags="$HaskellCPPArgs" SettingsLdCommand="\$topdir/../${mingw_bin_prefix}ld.exe" @@ -487,7 +486,6 @@ AC_DEFUN([FP_SETTINGS], SettingsTouchCommand='$topdir/bin/touchy.exe' else SettingsCCompilerCommand="$CC" - SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2" SettingsHaskellCPPCommand="$HaskellCPPCmd" SettingsHaskellCPPFlags="$HaskellCPPArgs" SettingsLdCommand="$LdCmd" @@ -525,6 +523,7 @@ AC_DEFUN([FP_SETTINGS], else SettingsOptCommand="$OptCmd" fi + SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2" SettingsCCompilerLinkFlags="$CONF_GCC_LINKER_OPTS_STAGE2" SettingsCCompilerSupportsNoPie="$CONF_GCC_SUPPORTS_NO_PIE" SettingsLdFlags="$CONF_LD_LINKER_OPTS_STAGE2" |