summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--aclocal.m41
-rw-r--r--configure.ac3
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
]
)