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>
38 lines
1.3 KiB
Makefile
38 lines
1.3 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,libtest))
|
|
|
|
$(eval $(call gb_Executable_set_include,libtest,\
|
|
$$(INCLUDE) \
|
|
))
|
|
|
|
ifeq ($(OS),LINUX)
|
|
$(eval $(call gb_Executable_add_libs,libtest,\
|
|
-ldl \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Executable_add_exception_objects,libtest,\
|
|
smoketest/libtest \
|
|
))
|
|
|
|
liblibreoffice_OWN_LD_PATH_DIR := $(INSTROOT)/program/libolib
|
|
liblibreoffice_OWN_LD_SO := $(liblibreoffice_OWN_LD_PATH_DIR)/$(call gb_Library__get_workdir_linktargetname,libreoffice)
|
|
|
|
$(liblibreoffice_OWN_LD_SO) : $(call gb_Library_get_target,libreoffice)
|
|
mkdir -p $(liblibreoffice_OWN_LD_PATH_DIR)/Library
|
|
cp -a $(call gb_Library_get_target,libreoffice) $(liblibreoffice_OWN_LD_SO)
|
|
|
|
run_libtest: $(liblibreoffice_OWN_LD_SO)
|
|
$(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}":$(liblibreoffice_OWN_LD_PATH_DIR)/Library" \
|
|
$(WORKDIR)/LinkTarget/Executable/libtest \
|
|
$(INSTROOT)/program $(WORKDIR)/Zip/smoketestdoc.sxw \
|
|
|
|
# vim: set noet sw=4 ts=4:
|