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 /onlineupdate | |
parent | external/libmspub: missing include (diff) | |
download | core-fda7f14cb5e4d5f93b2ee706b7ec6ad35a988ae5.tar.gz core-fda7f14cb5e4d5f93b2ee706b7ec6ad35a988ae5.zip |
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 'onlineupdate')
-rw-r--r-- | onlineupdate/Executable_test_updater_dialog.mk | 1 | ||||
-rw-r--r-- | onlineupdate/Executable_updater.mk | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/onlineupdate/Executable_test_updater_dialog.mk b/onlineupdate/Executable_test_updater_dialog.mk index 92e70dfae337..cae8e02df141 100644 --- a/onlineupdate/Executable_test_updater_dialog.mk +++ b/onlineupdate/Executable_test_updater_dialog.mk @@ -61,7 +61,6 @@ $(eval $(call gb_Executable_add_libs,test_updater_dialog,\ -lXrender \ -lSM \ -lICE \ - -lpthread \ )) endif diff --git a/onlineupdate/Executable_updater.mk b/onlineupdate/Executable_updater.mk index a4ceacee6bc1..5f83c13eb9ec 100644 --- a/onlineupdate/Executable_updater.mk +++ b/onlineupdate/Executable_updater.mk @@ -71,7 +71,6 @@ $(eval $(call gb_Executable_add_libs,updater,\ -lXrender \ -lSM \ -lICE \ - -lpthread \ )) endif |