diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-04-25 11:48:39 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-04-25 21:27:43 +0200 |
| commit | b1141fa61073b3f24e1a3574afa55a954e5a153d (patch) | |
| tree | 38099f5da3eb398436c1e2b85d77b955d6a886ea /libreofficekit | |
| parent | 1029d2a3ea3e6ec6f9b8a90a00e2b2b595fef5f2 (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 'libreofficekit')
| -rw-r--r-- | libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk | 1 | ||||
| -rw-r--r-- | libreofficekit/Executable_gtktiledviewer.mk | 1 | ||||
| -rw-r--r-- | libreofficekit/Executable_tilebench.mk | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk index d58923f45194..da3be044e853 100644 --- a/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk +++ b/libreofficekit/CppunitTest_libreofficekit_tiledrendering.mk @@ -28,7 +28,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_CppunitTest_add_libs,libreofficekit_tiledrendering,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/libreofficekit/Executable_gtktiledviewer.mk b/libreofficekit/Executable_gtktiledviewer.mk index 5dd89e6065f6..99ef51af8975 100644 --- a/libreofficekit/Executable_gtktiledviewer.mk +++ b/libreofficekit/Executable_gtktiledviewer.mk @@ -43,7 +43,6 @@ $(eval $(call gb_Executable_use_libraries,gtktiledviewer,\ ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) $(eval $(call gb_Executable_add_libs,gtktiledviewer,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ )) endif diff --git a/libreofficekit/Executable_tilebench.mk b/libreofficekit/Executable_tilebench.mk index 9977a93351ed..ae0a3b1f099b 100644 --- a/libreofficekit/Executable_tilebench.mk +++ b/libreofficekit/Executable_tilebench.mk @@ -24,7 +24,6 @@ $(eval $(call gb_Executable_use_libraries,tilebench,\ $(eval $(call gb_Executable_add_libs,tilebench,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ )) $(eval $(call gb_Executable_add_exception_objects,tilebench,\ |