From 05252f87e0d5f999be17c020d16217785fa2419f Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 20 Mar 2024 21:37:43 +0100 Subject: [PATCH] Use consistent conditions in code and makefile 24b06b9c6bdb777dff385b0fbfc81d55d3d013a1 "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 --- sal/Executable_cppunittester.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk index 959b3cd8be47..6c52197b22ce 100644 --- a/sal/Executable_cppunittester.mk +++ b/sal/Executable_cppunittester.mk @@ -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 \ ))