diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-04-25 11:48:39 +0200 |
---|---|---|
committer | Michael Stahl <Michael.Stahl@cib.de> | 2020-06-04 14:04:23 +0200 |
commit | fda7f14cb5e4d5f93b2ee706b7ec6ad35a988ae5 (patch) | |
tree | c0b8d5f26c2c855ad8bca02d41a422fd14afedf5 /svx | |
parent | 968fbfb4c987c1366c8a2ad435e5fdd9e281d397 (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).
Reviewed-on: https://gerrit.libreoffice.org/71291
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
(cherry picked from commit b1141fa61073b3f24e1a3574afa55a954e5a153d)
Change-Id: I936e082839cb9a434bd273ce5a1f187a4245dfa1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95130
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'svx')
-rw-r--r-- | svx/Executable_gengal.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/svx/Executable_gengal.mk b/svx/Executable_gengal.mk index 844ab0b45e16..7316f6de2a20 100644 --- a/svx/Executable_gengal.mk +++ b/svx/Executable_gengal.mk @@ -64,13 +64,11 @@ endif ifeq ($(ENABLE_HEADLESS),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 \ )) |