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 /desktop | |
| 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 'desktop')
| -rw-r--r-- | desktop/CppunitTest_desktop_app.mk | 1 | ||||
| -rw-r--r-- | desktop/CppunitTest_desktop_lokinit.mk | 1 | ||||
| -rw-r--r-- | desktop/Library_crashreport.mk | 1 | ||||
| -rw-r--r-- | desktop/Library_sofficeapp.mk | 3 |
4 files changed, 0 insertions, 6 deletions
diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk index cd698aceee5e..adb57add6e7a 100644 --- a/desktop/CppunitTest_desktop_app.mk +++ b/desktop/CppunitTest_desktop_app.mk @@ -66,7 +66,6 @@ endif $(eval $(call gb_CppunitTest_add_libs,desktop_app,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ -lX11 \ )) endif diff --git a/desktop/CppunitTest_desktop_lokinit.mk b/desktop/CppunitTest_desktop_lokinit.mk index 502f0807075b..1f648a1ecc83 100644 --- a/desktop/CppunitTest_desktop_lokinit.mk +++ b/desktop/CppunitTest_desktop_lokinit.mk @@ -40,7 +40,6 @@ ifeq ($(OS),LINUX) $(eval $(call gb_CppunitTest_add_libs,desktop_lok_init,\ -lm \ -ldl \ - -lpthread \ )) endif diff --git a/desktop/Library_crashreport.mk b/desktop/Library_crashreport.mk index 3b9d6dd34fdc..a2cef785f370 100644 --- a/desktop/Library_crashreport.mk +++ b/desktop/Library_crashreport.mk @@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,crashreport,\ $(eval $(call gb_Library_add_libs,crashreport,\ $(if $(filter LINUX %BSD SOLARIS, $(OS)), \ $(DLOPEN_LIBS) \ - -lpthread \ ) \ )) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 5c7de54c4ed0..bc5f7df4e483 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -19,7 +19,6 @@ $(eval $(call gb_Library_set_include,sofficeapp,\ $(eval $(call gb_Library_add_libs,sofficeapp,\ $(if $(filter LINUX %BSD SOLARIS, $(OS)), \ $(DLOPEN_LIBS) \ - -lpthread \ ) \ )) @@ -135,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ ifeq ($(DISABLE_GUI),TRUE) $(eval $(call gb_Library_add_libs,sofficeapp,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ )) else ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) @@ -147,7 +145,6 @@ endif $(eval $(call gb_Library_add_libs,sofficeapp,\ -lm $(DLOPEN_LIBS) \ - -lpthread \ -lX11 \ )) endif |