summaryrefslogtreecommitdiff
path: root/connectivity/Library_mysqlc.mk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-04-25 11:48:39 +0200
committerStephan Bergmann <sbergman@redhat.com>2019-04-25 21:27:43 +0200
commitb1141fa61073b3f24e1a3574afa55a954e5a153d (patch)
tree38099f5da3eb398436c1e2b85d77b955d6a886ea /connectivity/Library_mysqlc.mk
parent1029d2a3ea3e6ec6f9b8a90a00e2b2b595fef5f2 (diff)
Cut down on -pthread/-lpthread proliferation
Building against libstdc++ effectively always requires -pthread anyway (as various standard C++ headers require it, see the comment added to solenv/gbuild/platform/unxgcc.mk), so many explicit uses of -pthread/-lpthread can be removed. Doing a (partial) test build on Linux with Clang -stdlib=libc++ suggests that libc++ indeed doesn't need -pthread as libstdc++ does. The remaining uses of -pthread/-lpthread are mostly in configure.ac for the various BSDs (which somebody else might want to clean up now), and related to external projects. I tried to be careful to remove -pthread/-lpthread from makefiles only when C++ object files are involved (so -pthread will now be included on the link command line by default). Change-Id: I936e082839cb9a434bd273ce5a1f187a4245dfa1 Reviewed-on: https://gerrit.libreoffice.org/71291 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'connectivity/Library_mysqlc.mk')
-rw-r--r--connectivity/Library_mysqlc.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/connectivity/Library_mysqlc.mk b/connectivity/Library_mysqlc.mk
index 455f9b2224df..0999b46d3eec 100644
--- a/connectivity/Library_mysqlc.mk
+++ b/connectivity/Library_mysqlc.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\
$(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\
-lz -lm,-rdynamic -lz -lcrypt -lm)) \
- $(if $(filter LINUX,$(OS)),-lpthread -ldl,) \
+ $(if $(filter LINUX,$(OS)),-ldl,) \
))
$(eval $(call gb_Library_use_sdk_api,mysqlc))