Land #674, fix mingw builds with newer compiler versions

2 files changed, 5 insertions, 1 deletions

diff --git a/m4/check-hardening-options.m4 b/m4/check-hardening-options.m4
index 869f00b..c8ab12e 100644
--- a/m4/check-hardening-options.m4
+++ b/m4/check-hardening-options.m4
@@ -73,7 +73,9 @@ AC_DEFUN([CHECK_C_HARDENING_OPTIONS], [
                 CHECK_CFLAG([[-fno-strict-overflow]])
 
                 # _FORTIFY_SOURCE replaces builtin functions with safer versions.
-                AX_ADD_FORTIFY_SOURCE
+                AS_IF([test "x$HOST_OS" != "xwin"], [
+                        AX_ADD_FORTIFY_SOURCE
+                ])
 
                 # Enable read only relocations
                 CHECK_LDFLAG([[-Wl,-z,relro]])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8ce338f..f43bd85 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -172,9 +172,11 @@ check_PROGRAMS += dsatest
 dsatest_SOURCES = dsatest.c
 
 # dtlstest
+if !HOST_WIN
 TESTS += dtlstest.sh
 check_PROGRAMS += dtlstest
 dtlstest_SOURCES = dtlstest.c
+endif
 EXTRA_DIST += dtlstest.sh
 
 # ec_point_conversion