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

Use consistent conditions in code and makefile

Browse source 
24b06b9c6b "log access violation on windows
tinderboxen" introduced C++ code into sal/cppunittester/cppunittester.cxx that
is conditional on "#if defined(_DEBUG)" (which is defined iff
$(MSVC_USE_DEBUG_RUNTIME) is TRUE, see the setting of -D_DEBUG in
solenv/gbuild/gbuild.mk), and it introduced this corresponding makefile code
which should thus use the same condition.

Change-Id: I62fca71e31ed9215984572dc6a2e05be41651b15
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165080
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This commit is contained in:
Stephan Bergmann 2024-03-20 21:37:43 +01:00
parent a803d6862c
commit 05252f87e0
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sal/Executable_cppunittester.mk
View file

@ -28,7 +28,7 @@ $(eval $(call gb_Executable_add_exception_objects,cppunittester,\
sal/cppunittester/cppunittester \
))
ifneq ($(strip $(debug)$(DEBUG)),)
ifneq ($(MSVC_USE_DEBUG_RUNTIME),)
$(eval $(call gb_Executable_use_system_win32_libs,cppunittester,\
dbghelp \
))