Kaydet (Commit) b1141fa6 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

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: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 1029d2a3
...@@ -45,7 +45,6 @@ $(eval $(call gb_Executable_use_static_libraries,canvasdemo,\ ...@@ -45,7 +45,6 @@ $(eval $(call gb_Executable_use_static_libraries,canvasdemo,\
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,canvasdemo,\ $(eval $(call gb_Executable_add_libs,canvasdemo,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
......
...@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\ ...@@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,mysqlc,\
$(eval $(call gb_Library_add_libs,mysqlc,\ $(eval $(call gb_Library_add_libs,mysqlc,\
$(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\ $(if $(filter-out WNT,$(OS)),$(if $(filter HAIKU MACOSX SOLARIS,$(OS)),\
-lz -lm,-rdynamic -lz -lcrypt -lm)) \ -lz -lm,-rdynamic -lz -lcrypt -lm)) \
$(if $(filter LINUX,$(OS)),-lpthread -ldl,) \ $(if $(filter LINUX,$(OS)),-ldl,) \
)) ))
$(eval $(call gb_Library_use_sdk_api,mysqlc)) $(eval $(call gb_Library_use_sdk_api,mysqlc))
......
...@@ -61,7 +61,6 @@ $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ ...@@ -61,7 +61,6 @@ $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\
$(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \ $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \
$(if $(WITH_KRB5),$(KRB5_LIBS)) \ $(if $(WITH_KRB5),$(KRB5_LIBS)) \
$(if $(filter-out MACOSX,$(OS)),-ldl) \ $(if $(filter-out MACOSX,$(OS)),-ldl) \
$(if $(filter-out MACOSX,$(OS)),-lpthread) \
)) ))
endif endif
......
...@@ -66,7 +66,6 @@ endif ...@@ -66,7 +66,6 @@ endif
$(eval $(call gb_CppunitTest_add_libs,desktop_app,\ $(eval $(call gb_CppunitTest_add_libs,desktop_app,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
endif endif
......
...@@ -40,7 +40,6 @@ ifeq ($(OS),LINUX) ...@@ -40,7 +40,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_CppunitTest_add_libs,desktop_lok_init,\ $(eval $(call gb_CppunitTest_add_libs,desktop_lok_init,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,crashreport,\ ...@@ -26,7 +26,6 @@ $(eval $(call gb_Library_add_defs,crashreport,\
$(eval $(call gb_Library_add_libs,crashreport,\ $(eval $(call gb_Library_add_libs,crashreport,\
$(if $(filter LINUX %BSD SOLARIS, $(OS)), \ $(if $(filter LINUX %BSD SOLARIS, $(OS)), \
$(DLOPEN_LIBS) \ $(DLOPEN_LIBS) \
-lpthread \
) \ ) \
)) ))
......
...@@ -19,7 +19,6 @@ $(eval $(call gb_Library_set_include,sofficeapp,\ ...@@ -19,7 +19,6 @@ $(eval $(call gb_Library_set_include,sofficeapp,\
$(eval $(call gb_Library_add_libs,sofficeapp,\ $(eval $(call gb_Library_add_libs,sofficeapp,\
$(if $(filter LINUX %BSD SOLARIS, $(OS)), \ $(if $(filter LINUX %BSD SOLARIS, $(OS)), \
$(DLOPEN_LIBS) \ $(DLOPEN_LIBS) \
-lpthread \
) \ ) \
)) ))
...@@ -135,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ ...@@ -135,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\
ifeq ($(DISABLE_GUI),TRUE) ifeq ($(DISABLE_GUI),TRUE)
$(eval $(call gb_Library_add_libs,sofficeapp,\ $(eval $(call gb_Library_add_libs,sofficeapp,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
)) ))
else else
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
...@@ -147,7 +145,6 @@ endif ...@@ -147,7 +145,6 @@ endif
$(eval $(call gb_Library_add_libs,sofficeapp,\ $(eval $(call gb_Library_add_libs,sofficeapp,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
endif endif
......
...@@ -48,7 +48,6 @@ ifeq ($(OS),LINUX) ...@@ -48,7 +48,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,clucene,\ $(eval $(call gb_Library_add_libs,clucene,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -572,7 +572,6 @@ ifneq (,$(filter LINUX ANDROID,$(OS))) ...@@ -572,7 +572,6 @@ ifneq (,$(filter LINUX ANDROID,$(OS)))
$(eval $(call gb_Library_add_libs,pdfium,\ $(eval $(call gb_Library_add_libs,pdfium,\
-ldl \ -ldl \
-lrt \ -lrt \
-lpthread \
)) ))
$(eval $(call gb_Library_use_external,pdfium,freetype)) $(eval $(call gb_Library_use_external,pdfium,freetype))
......
...@@ -74,10 +74,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \ ...@@ -74,10 +74,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \
)) ))
endif 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)): \ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
gb_CC := $(filter-out -fsanitize%,$(gb_CC)) gb_CC := $(filter-out -fsanitize%,$(gb_CC))
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,jpipe)): \
......
...@@ -28,7 +28,6 @@ ifeq ($(OS),LINUX) ...@@ -28,7 +28,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_CppunitTest_add_libs,libreofficekit_tiledrendering,\ $(eval $(call gb_CppunitTest_add_libs,libreofficekit_tiledrendering,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -43,7 +43,6 @@ $(eval $(call gb_Executable_use_libraries,gtktiledviewer,\ ...@@ -43,7 +43,6 @@ $(eval $(call gb_Executable_use_libraries,gtktiledviewer,\
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,gtktiledviewer,\ $(eval $(call gb_Executable_add_libs,gtktiledviewer,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
)) ))
endif endif
......
...@@ -24,7 +24,6 @@ $(eval $(call gb_Executable_use_libraries,tilebench,\ ...@@ -24,7 +24,6 @@ $(eval $(call gb_Executable_use_libraries,tilebench,\
$(eval $(call gb_Executable_add_libs,tilebench,\ $(eval $(call gb_Executable_add_libs,tilebench,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
)) ))
$(eval $(call gb_Executable_add_exception_objects,tilebench,\ $(eval $(call gb_Executable_add_exception_objects,tilebench,\
......
...@@ -57,7 +57,6 @@ $(eval $(call gb_Executable_add_libs,test_updater_dialog,\ ...@@ -57,7 +57,6 @@ $(eval $(call gb_Executable_add_libs,test_updater_dialog,\
-lXrender \ -lXrender \
-lSM \ -lSM \
-lICE \ -lICE \
-lpthread \
)) ))
endif endif
......
...@@ -70,7 +70,6 @@ $(eval $(call gb_Executable_add_libs,updater,\ ...@@ -70,7 +70,6 @@ $(eval $(call gb_Executable_add_libs,updater,\
-lXrender \ -lXrender \
-lSM \ -lSM \
-lICE \ -lICE \
-lpthread \
)) ))
endif endif
......
...@@ -56,9 +56,6 @@ $(eval $(call gb_Library_use_system_win32_libs,sal,\ ...@@ -56,9 +56,6 @@ $(eval $(call gb_Library_use_system_win32_libs,sal,\
)) ))
$(eval $(call gb_Library_add_libs,sal,\ $(eval $(call gb_Library_add_libs,sal,\
$(if $(filter-out ANDROID HAIKU WNT,$(OS)), \
-lpthread \
) \
$(if $(filter LINUX,$(OS)), \ $(if $(filter LINUX,$(OS)), \
-ldl \ -ldl \
-lrt \ -lrt \
......
...@@ -118,12 +118,6 @@ $(eval $(call gb_CppunitTest_add_libs,sc_ucalc,\ ...@@ -118,12 +118,6 @@ $(eval $(call gb_CppunitTest_add_libs,sc_ucalc,\
)) ))
endif endif
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_CppunitTest_add_libs,sc_ucalc,\
-lpthread \
))
endif
$(eval $(call gb_CppunitTest_use_configuration,sc_ucalc)) $(eval $(call gb_CppunitTest_use_configuration,sc_ucalc))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -718,12 +718,6 @@ $(eval $(call gb_Library_add_libs,sc,\ ...@@ -718,12 +718,6 @@ $(eval $(call gb_Library_add_libs,sc,\
)) ))
endif endif
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,sc,\
-lpthread \
))
endif
$(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc)) $(eval $(call gb_SdiTarget_SdiTarget,sc/sdi/scslots,sc/sdi/scalc))
$(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\ $(eval $(call gb_SdiTarget_set_include,sc/sdi/scslots,\
......
...@@ -16,7 +16,6 @@ $(eval $(call gb_Executable_set_include,libtest,\ ...@@ -16,7 +16,6 @@ $(eval $(call gb_Executable_set_include,libtest,\
ifeq ($(OS),LINUX) ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,libtest,\ $(eval $(call gb_Executable_add_libs,libtest,\
-ldl \ -ldl \
-pthread \
)) ))
endif endif
......
...@@ -18,7 +18,7 @@ gb_LinkTarget_LDFLAGS += $(gb__LinkTarget_LDFLAGS_zdefs) ...@@ -18,7 +18,7 @@ gb_LinkTarget_LDFLAGS += $(gb__LinkTarget_LDFLAGS_zdefs)
include $(GBUILDDIR)/platform/unxgcc.mk include $(GBUILDDIR)/platform/unxgcc.mk
ifeq ($(DISABLE_DYNLOADING),TRUE) ifeq ($(DISABLE_DYNLOADING),TRUE)
gb_STDLIBS := -lpthread -ldl gb_STDLIBS := -ldl
endif endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -42,12 +42,20 @@ gb_CFLAGS := \ ...@@ -42,12 +42,20 @@ gb_CFLAGS := \
-Wdeclaration-after-statement \ -Wdeclaration-after-statement \
-Wshadow \ -Wshadow \
# At least libstdc++ (which is approximated here with !HAVE_LIBCXX) needs -pthread when including
# various C++ headers like <thread>, see <https://gcc.gnu.org/onlinedocs/gcc-8.3.0/libstdc++/manual/
# manual/using.html#manual.intro.using.flags>:
ifeq ($(HAVE_LIBCXX),)
gb_CXX_LINKFLAGS := -pthread
endif
gb_CXXFLAGS := \ gb_CXXFLAGS := \
$(gb_CXXFLAGS_COMMON) \ $(gb_CXXFLAGS_COMMON) \
-fPIC \ -fPIC \
-Wshadow \ -Wshadow \
-Woverloaded-virtual \ -Woverloaded-virtual \
$(CXXFLAGS_CXX11) \ $(CXXFLAGS_CXX11) \
$(gb_CXX_LINKFLAGS) \
# enable debug STL # enable debug STL
...@@ -112,7 +120,7 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS) ...@@ -112,7 +120,7 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS)
# contains .c sources: # contains .c sources:
define gb_LinkTarget__command_dynamiclink define gb_LinkTarget__command_dynamiclink
$(call gb_Helper_abbreviate_dirs,\ $(call gb_Helper_abbreviate_dirs,\
$(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(gb_CXX),$(gb_CC)) \ $(if $(CXXOBJECTS)$(GENCXXOBJECTS)$(EXTRAOBJECTLISTS)$(filter-out XTRUE,X$(ENABLE_RUNTIME_OPTIMIZATIONS)),$(gb_CXX) $(gb_CXX_LINKFLAGS),$(gb_CC)) \
$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \ $(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
$(gb_LTOFLAGS) \ $(gb_LTOFLAGS) \
$(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \ $(if $(SOVERSIONSCRIPT),-Wl$(COMMA)--soname=$(notdir $(1)) \
......
...@@ -111,11 +111,6 @@ $(eval $(call gb_Library_use_externals,svl,\ ...@@ -111,11 +111,6 @@ $(eval $(call gb_Library_use_externals,svl,\
nss3 \ nss3 \
plc4 \ plc4 \
)) ))
ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,svl, \
-lpthread \
))
endif
endif # BUILD_TYPE=DESKTOP endif # BUILD_TYPE=DESKTOP
endif endif
......
...@@ -64,13 +64,11 @@ endif ...@@ -64,13 +64,11 @@ endif
ifeq ($(DISABLE_GUI),TRUE) ifeq ($(DISABLE_GUI),TRUE)
$(eval $(call gb_Executable_add_libs,gengal,\ $(eval $(call gb_Executable_add_libs,gengal,\
$(DLOPEN_LIBS) \ $(DLOPEN_LIBS) \
-lpthread \
)) ))
else else
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,gengal,\ $(eval $(call gb_Executable_add_libs,gengal,\
$(DLOPEN_LIBS) \ $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
......
...@@ -37,7 +37,6 @@ $(eval $(call gb_Executable_use_static_libraries,icontest,\ ...@@ -37,7 +37,6 @@ $(eval $(call gb_Executable_use_static_libraries,icontest,\
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,icontest,\ $(eval $(call gb_Executable_add_libs,icontest,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
......
...@@ -92,7 +92,6 @@ ifeq ($(OS),LINUX) ...@@ -92,7 +92,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,lo_kde5filepicker,\ $(eval $(call gb_Executable_add_libs,lo_kde5filepicker,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -43,7 +43,6 @@ $(eval $(call gb_Executable_use_static_libraries,mtfdemo,\ ...@@ -43,7 +43,6 @@ $(eval $(call gb_Executable_use_static_libraries,mtfdemo,\
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,mtfdemo,\ $(eval $(call gb_Executable_add_libs,mtfdemo,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
......
...@@ -37,7 +37,6 @@ $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\ ...@@ -37,7 +37,6 @@ $(eval $(call gb_Executable_add_exception_objects,ui-previewer,\
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,ui-previewer,\ $(eval $(call gb_Executable_add_libs,ui-previewer,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
......
...@@ -53,7 +53,6 @@ $(eval $(call gb_Executable_use_static_libraries,vcldemo,\ ...@@ -53,7 +53,6 @@ $(eval $(call gb_Executable_use_static_libraries,vcldemo,\
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Executable_add_libs,vcldemo,\ $(eval $(call gb_Executable_add_libs,vcldemo,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
......
...@@ -45,7 +45,6 @@ ifeq ($(OS),LINUX) ...@@ -45,7 +45,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Executable_add_libs,visualbackendtest,\ $(eval $(call gb_Executable_add_libs,visualbackendtest,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
-lX11 \ -lX11 \
)) ))
......
...@@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\ ...@@ -66,7 +66,6 @@ $(eval $(call gb_Library_add_exception_objects,desktop_detector,\
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,desktop_detector,\ $(eval $(call gb_Library_add_libs,desktop_detector,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
)) ))
endif endif
......
...@@ -545,11 +545,6 @@ $(eval $(call gb_Library_use_externals,vcl,\ ...@@ -545,11 +545,6 @@ $(eval $(call gb_Library_use_externals,vcl,\
freetype \ freetype \
fontconfig \ fontconfig \
)) ))
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,vcl,\
-lpthread \
))
endif
else # ! DISABLE_GUI else # ! DISABLE_GUI
...@@ -578,7 +573,6 @@ endif ...@@ -578,7 +573,6 @@ endif
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
$(eval $(call gb_Library_add_libs,vcl,\ $(eval $(call gb_Library_add_libs,vcl,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
-lXext \ -lXext \
)) ))
......
...@@ -145,7 +145,6 @@ ifeq ($(OS),LINUX) ...@@ -145,7 +145,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,vclplug_gen,\ $(eval $(call gb_Library_add_libs,vclplug_gen,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -126,7 +126,6 @@ ifeq ($(OS),LINUX) ...@@ -126,7 +126,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,vclplug_gtk,\ $(eval $(call gb_Library_add_libs,vclplug_gtk,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -116,7 +116,6 @@ ifeq ($(OS),LINUX) ...@@ -116,7 +116,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,vclplug_gtk3,\ $(eval $(call gb_Library_add_libs,vclplug_gtk3,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -124,7 +124,6 @@ ifeq ($(OS),LINUX) ...@@ -124,7 +124,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,vclplug_gtk3_kde5,\ $(eval $(call gb_Library_add_libs,vclplug_gtk3_kde5,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -89,7 +89,6 @@ ifeq ($(OS),LINUX) ...@@ -89,7 +89,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,vclplug_kde5,\ $(eval $(call gb_Library_add_libs,vclplug_kde5,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -114,7 +114,6 @@ ifeq ($(OS),LINUX) ...@@ -114,7 +114,6 @@ ifeq ($(OS),LINUX)
$(eval $(call gb_Library_add_libs,vclplug_qt5,\ $(eval $(call gb_Library_add_libs,vclplug_qt5,\
-lm \ -lm \
-ldl \ -ldl \
-lpthread \
)) ))
endif endif
......
...@@ -31,7 +31,6 @@ $(eval $(call gb_StaticLibrary_use_api,glxtest,\ ...@@ -31,7 +31,6 @@ $(eval $(call gb_StaticLibrary_use_api,glxtest,\
$(eval $(call gb_StaticLibrary_add_libs,glxtest,\ $(eval $(call gb_StaticLibrary_add_libs,glxtest,\
-lm $(DLOPEN_LIBS) \ -lm $(DLOPEN_LIBS) \
-lpthread \
-lX11 \ -lX11 \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment