diff options
author | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-05-30 04:52:23 +0000 |
---|---|---|
committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2021-05-30 05:12:30 +0000 |
commit | e07b5feba5103e662016158a2d77ca6bf1db12fb (patch) | |
tree | 64721480cd40a2c668cba6a7cbea3ad84284a9b2 /m4 | |
parent | 420723ee1818e1b62300f845f7af6a1a0cba6398 (diff) | |
download | portable-e07b5feba5103e662016158a2d77ca6bf1db12fb.tar.gz portable-e07b5feba5103e662016158a2d77ca6bf1db12fb.tar.bz2 portable-e07b5feba5103e662016158a2d77ca6bf1db12fb.zip |
Remove -D_FORTIFY_SOURCE=2 and -lssp with mingw build
Diffstat (limited to 'm4')
-rw-r--r-- | m4/check-hardening-options.m4 | 4 | ||||
-rw-r--r-- | m4/check-os-options.m4 | 2 |
2 files changed, 4 insertions, 2 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], [ | |||
73 | CHECK_CFLAG([[-fno-strict-overflow]]) | 73 | CHECK_CFLAG([[-fno-strict-overflow]]) |
74 | 74 | ||
75 | # _FORTIFY_SOURCE replaces builtin functions with safer versions. | 75 | # _FORTIFY_SOURCE replaces builtin functions with safer versions. |
76 | AX_ADD_FORTIFY_SOURCE | 76 | AS_IF([test "x$HOST_OS" != "xwin"], [ |
77 | AX_ADD_FORTIFY_SOURCE | ||
78 | ]) | ||
77 | 79 | ||
78 | # Enable read only relocations | 80 | # Enable read only relocations |
79 | CHECK_LDFLAG([[-Wl,-z,relro]]) | 81 | CHECK_LDFLAG([[-Wl,-z,relro]]) |
diff --git a/m4/check-os-options.m4 b/m4/check-os-options.m4 index 9343bc2..644bf71 100644 --- a/m4/check-os-options.m4 +++ b/m4/check-os-options.m4 | |||
@@ -112,7 +112,7 @@ char buf[1]; getentropy(buf, 1); | |||
112 | CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" | 112 | CPPFLAGS="$CPPFLAGS -D_REENTRANT -D_POSIX_THREAD_SAFE_FUNCTIONS" |
113 | CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" | 113 | CPPFLAGS="$CPPFLAGS -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0600" |
114 | CPPFLAGS="$CPPFLAGS" | 114 | CPPFLAGS="$CPPFLAGS" |
115 | AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt -lssp']) | 115 | AC_SUBST([PLATFORM_LDADD], ['-lws2_32 -lbcrypt']) |
116 | ;; | 116 | ;; |
117 | *solaris*) | 117 | *solaris*) |
118 | HOST_OS=solaris | 118 | HOST_OS=solaris |