summaryrefslogtreecommitdiff
path: root/desktop/Library_sofficeapp.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 /desktop/Library_sofficeapp.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 'desktop/Library_sofficeapp.mk')
-rw-r--r--desktop/Library_sofficeapp.mk3
1 files changed, 0 insertions, 3 deletions
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