From 8b5d26208c80814afacb976a4ac22b5514b87aac Mon Sep 17 00:00:00 2001
From: Austin Seipp <austin@well-typed.com>
Date: Fri, 4 Jul 2014 09:40:25 -0500
Subject: [PATCH] Fix windows breakage (fallout from 34f7e9a3c998)
Signed-off-by: Austin Seipp <austin@well-typed.com>
(cherry picked from commit 0567a3133bfd3f2085d2fc0211e91eaed96a3e83)
---
aclocal.m4 | 1 +
configure.ac | 3 ---
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/aclocal.m4 b/aclocal.m4
index feb4f3805157..7224cd5b3b65 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 3ac1cbd66c2c..f1b949bcfa3c 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
]
)
--
GitLab