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>
72 lines
1.9 KiB
Makefile
72 lines
1.9 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/.
|
|
#
|
|
# This file incorporates work covered by the following license notice:
|
|
#
|
|
# Licensed to the Apache Software Foundation (ASF) under one or more
|
|
# contributor license agreements. See the NOTICE file distributed
|
|
# with this work for additional information regarding copyright
|
|
# ownership. The ASF licenses this file to you under the Apache
|
|
# License, Version 2.0 (the "License"); you may not use this file
|
|
# except in compliance with the License. You may obtain a copy of
|
|
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
#
|
|
|
|
$(eval $(call gb_Library_Library,desktop_detector))
|
|
|
|
$(eval $(call gb_Library_set_include,desktop_detector,\
|
|
$$(INCLUDE) \
|
|
-I$(SRCDIR)/vcl/inc \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_defs,desktop_detector,\
|
|
-DDESKTOP_DETECTOR_IMPLEMENTATION \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_sdk_api,desktop_detector))
|
|
|
|
$(eval $(call gb_Library_use_libraries,desktop_detector,\
|
|
vcl \
|
|
tl \
|
|
utl \
|
|
sot \
|
|
ucbhelper \
|
|
basegfx \
|
|
comphelper \
|
|
cppuhelper \
|
|
i18nlangtag \
|
|
i18nutil \
|
|
$(if $(ENABLE_JAVA), \
|
|
jvmaccess) \
|
|
cppu \
|
|
sal \
|
|
))
|
|
|
|
$(eval $(call gb_Library_use_externals,desktop_detector,\
|
|
boost_headers \
|
|
icuuc \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_libs,desktop_detector,\
|
|
-lX11 \
|
|
-lXext \
|
|
-lSM \
|
|
-lICE \
|
|
))
|
|
|
|
$(eval $(call gb_Library_add_exception_objects,desktop_detector,\
|
|
vcl/unx/generic/desktopdetect/desktopdetector \
|
|
))
|
|
|
|
ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS)))
|
|
$(eval $(call gb_Library_add_libs,desktop_detector,\
|
|
-lm $(DLOPEN_LIBS) \
|
|
))
|
|
endif
|
|
|
|
# vim: set noet sw=4 ts=4:
|