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>
85 lines
2.1 KiB
Makefile
85 lines
2.1 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_Library_Library,jpipe))
|
|
|
|
ifeq ($(OS),WNT)
|
|
|
|
# The real library is called jpipx on Windows. We build only a wrapper
|
|
# for it here.
|
|
$(eval $(call gb_Library_add_cobjects,jpipe,\
|
|
jurt/source/pipe/wrapper/wrapper \
|
|
))
|
|
|
|
else
|
|
|
|
ifeq ($(COM_IS_CLANG),TRUE)
|
|
ifneq ($(filter -fsanitize=%,$(gb_CC)),)
|
|
Library_jpipe__staticsalhack = TRUE
|
|
endif
|
|
endif
|
|
|
|
ifeq ($(Library_jpipe__staticsalhack),)
|
|
|
|
$(eval $(call gb_Library_use_libraries,jpipe,\
|
|
sal \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_cobjects,jpipe,\
|
|
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \
|
|
))
|
|
|
|
else
|
|
|
|
# HACK for Clang -fsanitize=address etc. to build libjpipe.so (dlopen'ed from
|
|
# java executable) without dependence on __asan_* etc. symbols (expected to be
|
|
# provided by the executable), incl. statically linking in the relevant parts of
|
|
# sal:
|
|
|
|
$(eval $(call gb_Library_add_cobjects,jpipe, \
|
|
jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,jpipe, \
|
|
jurt/source/pipe/staticsalhack \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,jpipe, \
|
|
-DRTL_OS="\"$(RTL_OS)"\" \
|
|
-DRTL_ARCH="\"$(RTL_ARCH)"\" \
|
|
))
|
|
|
|
$(eval $(call gb_Library_set_include,jpipe, \
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR) \
|
|
-I$(SRCDIR)/sal/inc \
|
|
-I$(SRCDIR)/sal/osl/unx \
|
|
-I$(SRCDIR)/sal/rtl \
|
|
-I$(SRCDIR)/sal/textenc \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,jpipe, \
|
|
boost_headers \
|
|
))
|
|
|
|
ifeq ($(OS),MACOSX)
|
|
$(eval $(call gb_Library_use_system_darwin_frameworks,jpipe, \
|
|
CoreFoundation \
|
|
))
|
|
endif
|
|
|
|
$(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)): \
|
|
gb_CXX := $(filter-out -fsanitize%,$(gb_CXX))
|
|
|
|
endif
|
|
endif
|
|
|
|
# vim:set noet sw=4 ts=4:
|