commit 7a570b818246ca8c8efe4b7de116804f6ebddd91
Author: Nick Mathewson <ni...@torproject.org>
Date: Wed Aug 8 09:56:51 2018 -0400
Don't search for -lpthread on Windows
If we're building for Windows, we want to use windows threads no
matter what, and we don't want to link a pthread library even if it
is present. Fixes bug 27081; bugfix on 1790dc67607799a in 0.1.0.1-rc.
---
changes/bug27081 | 4 ++++
configure.ac | 6 ++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/changes/bug27081 b/changes/bug27081
new file mode 100644
index 000000000..74e0efbd2
--- /dev/null
+++ b/changes/bug27081
@@ -0,0 +1,4 @@
+ o Minor bugfixes (compilation, windows):
+ - Don't link or search for pthreads when building for Windows, even if we
+ are using build environment (like mingw) that provides a pthreads
+ library. Fixes bug 27081; bugfix on 0.1.0.1-rc.
diff --git a/configure.ac b/configure.ac
index d70032992..76b3f423a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -370,8 +370,10 @@ if test "$LIBS" != "$saved_LIBS"; then
have_rt=yes
fi
-AC_SEARCH_LIBS(pthread_create, [pthread])
-AC_SEARCH_LIBS(pthread_detach, [pthread])
+if test "$bwin32" = "false"; then
+ AC_SEARCH_LIBS(pthread_create, [pthread])
+ AC_SEARCH_LIBS(pthread_detach, [pthread])
+fi
AM_CONDITIONAL(THREADS_WIN32, test "$bwin32" = "true")
AM_CONDITIONAL(THREADS_PTHREADS, test "$bwin32" = "false")
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
