diff options
| author | Austin Seipp <austin@well-typed.com> | 2014-07-04 09:40:25 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-07-04 09:59:36 -0500 |
| commit | 8b5d26208c80814afacb976a4ac22b5514b87aac (patch) | |
| tree | 2454a6df10151fe933a22c5de371abf78037230f | |
| parent | 2b854a182be15387cf420e982bfb58957dd4e1d7 (diff) | |
| download | haskell-8b5d26208c80814afacb976a4ac22b5514b87aac.tar.gz | |
Fix windows breakage (fallout from 34f7e9a3c998)
Signed-off-by: Austin Seipp <austin@well-typed.com>
(cherry picked from commit 0567a3133bfd3f2085d2fc0211e91eaed96a3e83)
| -rw-r--r-- | aclocal.m4 | 1 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index feb4f38051..7224cd5b3b 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -452,6 +452,7 @@ AC_DEFUN([FP_SETTINGS], mingw_bin_prefix=mingw/bin/ SettingsCCompilerCommand="\$topdir/../${mingw_bin_prefix}gcc.exe" SettingsHaskellCPPCommand="\$topdir/../${mingw_bin_prefix}gcc.exe" + SettingsHaskellCPPFlags="$HaskellCPPArgs" SettingsLdCommand="\$topdir/../${mingw_bin_prefix}ld.exe" SettingsArCommand="\$topdir/../${mingw_bin_prefix}ar.exe" SettingsPerlCommand='$topdir/../perl/perl.exe' diff --git a/configure.ac b/configure.ac index 3ac1cbd66c..f1b949bcfa 100644 --- a/configure.ac +++ b/configure.ac @@ -493,10 +493,7 @@ AC_ARG_WITH(hs-cpp, fi ], [ - if test "$HostOS" != "mingw32" - then HaskellCPPCmd=$WhatGccIsCalled - fi ] ) |