b1141fa610
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>
56 lines
1.2 KiB
Makefile
56 lines
1.2 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
$(eval $(call gb_Executable_Executable,canvasdemo))
|
|
|
|
$(eval $(call gb_Executable_use_api,canvasdemo,\
|
|
offapi \
|
|
udkapi \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_use_externals,canvasdemo,\
|
|
boost_headers \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_set_include,canvasdemo,\
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_use_libraries,canvasdemo,\
|
|
basegfx \
|
|
comphelper \
|
|
cppu \
|
|
cppuhelper \
|
|
tl \
|
|
sal \
|
|
salhelper \
|
|
vcl \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_add_exception_objects,canvasdemo,\
|
|
canvas/workben/canvasdemo \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_use_static_libraries,canvasdemo,\
|
|
vclmain \
|
|
))
|
|
|
|
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
|
|
$(eval $(call gb_Executable_add_libs,canvasdemo,\
|
|
-lm $(DLOPEN_LIBS) \
|
|
-lX11 \
|
|
))
|
|
|
|
$(eval $(call gb_Executable_use_static_libraries,canvasdemo,\
|
|
glxtest \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|