comphelper/source/misc/debuggerinfo.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit c61ac5d16e2fe1681375a6c37f32d16b7fd2a4ef
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Mar 18 13:49:57 2020 +0100
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Mar 18 14:37:18 2020 +0100
comphelper::isDebuggerAttached must be defined irrespective of NDEBUG
ac9083f64fc064e4bad3dc522a90ca214b3f1c2f "make isDebuggerAttached() public
comphelper API" had forgotten to drop the NDEBUG condition, causing
--enable-dbgutil --disable-assert-always-abort builds like
<https://ci.libreoffice.org//job/lo_tb_random_config_linux/2215/> to fail
with
> /usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld:
/lo/home/tdf/lode/jenkins/workspace/lo_tb_random_config_linux/workdir/CxxObject/vcl/source/app/watchdog.o:
in function `WatchdogThread::start()':
>
/lo/home/tdf/lode/jenkins/workspace/lo_tb_random_config_linux/vcl/source/app/watchdog.cxx:138:
undefined reference to `comphelper::isDebuggerAttached()'
> collect2: error: ld returned 1 exit status
>
/lo/home/tdf/lode/jenkins/workspace/lo_tb_random_config_linux/vcl/Library_vcl.mk:20:
recipe for target
'/lo/home/tdf/lode/jenkins/workspace/lo_tb_random_config_linux/instdir/program/libvcllo.so'
failed
Change-Id: Ia391881f0b6a79709fbebfd204097840a9890147
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90698
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/comphelper/source/misc/debuggerinfo.cxx
b/comphelper/source/misc/debuggerinfo.cxx
index 9d452f174ab5..07b2f0132fff 100644
--- a/comphelper/source/misc/debuggerinfo.cxx
+++ b/comphelper/source/misc/debuggerinfo.cxx
@@ -23,7 +23,7 @@
namespace comphelper
{
-#if defined DBG_UTIL && !defined NDEBUG
+#if defined DBG_UTIL
bool isDebuggerAttached()
{
#if defined(_WIN32)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
