From 7d4ff76868901fabd5a53ec951bbe1f05843960c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 4 Nov 2021 13:01:53 +0100 Subject: [PATCH] Fix check for libstdc++ ...now that we have HAVE_LIBSTDCPP since 7158acde7756a264c09e24e1cfe4c81db700b920 "Consolidate -D_GLIBCXX_DEBUG for --enable-dbgutil builds against libstdc++". HAVE_LIBCXX was only ever defined in config_host/config_libcxx.h (since 90d2155912bcee40377620d4836726041a72d537 "Work around latest Boost 1.65.1 still using deprecated std::auto_ptr"), never as a makefile variable, so this check (introduced in b1141fa61073b3f24e1a3574afa55a954e5a153d "Cut down on -pthread/-lpthread proliferation") always succeeded, whether libstdc++ or not. Change-Id: If71615b0ae2c6d3765eb538857f36bb1d23a667a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124683 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- solenv/gbuild/platform/unxgcc.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index 10ce62f891ba..0cec2ecfbc0c 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -42,10 +42,10 @@ gb_CFLAGS := \ -Wdeclaration-after-statement \ -Wshadow \ -# At least libstdc++ (which is approximated here with !HAVE_LIBCXX) needs -pthread when including -# various C++ headers like , see : -ifeq ($(HAVE_LIBCXX),) +# At least libstdc++ needs -pthread when including various C++ headers like , see +# : +ifneq ($(HAVE_LIBSTDCPP),) gb_CXX_LINKFLAGS := -pthread endif