strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

comphelper::isDebuggerAttached must be defined irrespective of NDEBUG

Browse source 
ac9083f64f "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 <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann 2020-03-18 13:49:57 +01:00
parent 345116a074
commit c61ac5d16e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
comphelper/source/misc/debuggerinfo.cxx
View file

@ -23,7 +23,7 @@
namespace comphelper
{
#if defined DBG_UTIL && !defined NDEBUG
#if defined DBG_UTIL
bool isDebuggerAttached()
{
#if defined(_WIN32)