diff options
| author | Tamar Christina <tamar@zhox.com> | 2017-06-17 01:05:52 +0100 |
|---|---|---|
| committer | Tamar Christina <tamar@zhox.com> | 2017-06-17 01:17:07 +0100 |
| commit | d6cecde585b0980ed8e0050c5a1d315789fb6356 (patch) | |
| tree | 6f8a7b515787652eedaeb1e18ee22ec7acde9a27 /aclocal.m4 | |
| parent | fda094d000cf2c2874a8205c8212cb83b52259ef (diff) | |
| download | haskell-d6cecde585b0980ed8e0050c5a1d315789fb6356.tar.gz | |
Remove the Windows GCC driver.
Summary:
This patch drops the GCC driver and instead moves
the only remaining path that we need to keep for
backwards compatibility to the settings file.
It also generalizes the code that expands `$TopDir`
so it can expand it within any location in the string
and also changes it so `$TopDir` is expanded only
after the words call because `$TopDir` can contains
spaces which would be horribly broken.
Test Plan: ./validate
Reviewers: austin, hvr, bgamari
Reviewed By: bgamari
Subscribers: rwbarton, thomie, erikd
GHC Trac Issues: #13709
Differential Revision: https://phabricator.haskell.org/D3592
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index db394f38d6..40aaf9167f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -464,6 +464,7 @@ 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" @@ -486,6 +487,7 @@ AC_DEFUN([FP_SETTINGS], SettingsTouchCommand='$topdir/bin/touchy.exe' else SettingsCCompilerCommand="$CC" + SettingsCCompilerFlags="$CONF_CC_OPTS_STAGE2" SettingsHaskellCPPCommand="$HaskellCPPCmd" SettingsHaskellCPPFlags="$HaskellCPPArgs" SettingsLdCommand="$LdCmd" @@ -523,7 +525,6 @@ 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" |