summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorAndrea Corallo <akrl@sdf.org>2020-12-27 17:54:57 +0100
committerAndrea Corallo <akrl@sdf.org>2020-12-27 17:54:57 +0100
commit8fb94630136700aa4e74c7fc212b019d2db380ae (patch)
tree69b3938a89f450509a7001f45ba3acca057fb40d /nt
parent271fb8a269aff924070b188f23355d0c368356dd (diff)
parentdf882c9701755e2ae063f05d3381de14ae09951e (diff)
downloademacs-8fb94630136700aa4e74c7fc212b019d2db380ae.tar.gz
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'nt')
-rw-r--r--nt/mingw-cfg.site6
1 files changed, 6 insertions, 0 deletions
diff --git a/nt/mingw-cfg.site b/nt/mingw-cfg.site
index a2c93996970..431fdab51bb 100644
--- a/nt/mingw-cfg.site
+++ b/nt/mingw-cfg.site
@@ -83,6 +83,8 @@ ac_cv_func_readlink=yes
ac_cv_func_symlink=yes
# Avoid run-time tests of readlink and symlink, which will fail
gl_cv_func_readlink_works=yes
+gl_cv_func_readlink_trailing_slash=yes
+gl_cv_func_readlink_truncate=yes
gl_cv_func_symlink_works=yes
ac_cv_func_readlinkat=yes
ac_cv_func_faccessat=yes
@@ -160,3 +162,7 @@ gl_cv_lib_assume_bcrypt=no
# symbol erroneously
# <https://debbugs.gnu.org/cgi/bugreport.cgi?bug=45303#83>.
ac_cv_func_strsignal=no
+# Don't build the Gnulib free.c: it is not needed, since the w32
+# implementation of 'free' doesn't touch errno, and it emits a
+# compilation warning.
+gl_cv_func_free_preserves_errno=yes