summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2019-04-25 11:48:39 +0200
committerTor Lillqvist <tml@collabora.com>2020-05-01 23:32:41 +0200
commit3f51807aed5f97eae4bddea01173d138658463c5 (patch)
treea85a60ce2c8765f6770ea0d1a0fd4bc9bfe07a6e /svx
parentd996e8074ce122c887617c2c7fb20c4a67530aa3 (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> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93206 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'svx')
-rw-r--r--svx/Executable_gengal.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk
index e4c73928711b..f505e9e5c7f0 100644
--- a/svx/Executable_gengal.mk
+++ b/svx/Executable_gengal.mk
@@ -64,13 +64,11 @@ endif
ifeq ($(DISABLE_GUI),TRUE)
$(eval $(call gb_Executable_add_libs,gengal,\
$(DLOPEN_LIBS) \
- -lpthread \
))
else
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,gengal,\
$(DLOPEN_LIBS) \
- -lpthread \
-lX11 \
))