diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2019-04-25 11:48:39 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2020-05-01 23:32:41 +0200 |
commit | 3f51807aed5f97eae4bddea01173d138658463c5 (patch) | |
tree | a85a60ce2c8765f6770ea0d1a0fd4bc9bfe07a6e /jurt | |
parent | d996e8074ce122c887617c2c7fb20c4a67530aa3 (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 'jurt')
-rw-r--r-- | jurt/Library_jpipe.mk | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk index 5759baed5175..204da654c553 100644 --- a/jurt/Library_jpipe.mk +++ b/jurt/Library_jpipe.mk @@ -74,10 +74,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \ )) endif -$(eval $(call gb_Library_add_libs,jpipe, \ - $(if $(filter-out $(OS),ANDROID),-lpthread) \ -)) - $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \ gb_CC := $(filter-out -fsanitize%,$(gb_CC)) $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \ |