configure.ac | 12 +++++++++++- external/libxml2/ExternalProject_libxml2.mk | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-)
New commits: commit e03956dc648b0c40734725a636f99bada0302e28 Author: Tor Lillqvist <[email protected]> AuthorDate: Tue Apr 8 16:58:59 2025 +0300 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:35:19 2025 +0100 Add --enable-msvc-debug-runtime to use that even without dbgutil Adapt libxml2 build accordingly. It's MSVC_USE_DEBUG_RUNTIME we should check to see whether the ICU libraries have a 'd' suffix in their names, not ENABLE_DBGUTIL. Change-Id: Ic817e3c15e7164478ae557627047d3793e3a88c7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194584 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> diff --git a/configure.ac b/configure.ac index ae1a9ceca39b..88f983a1423d 100644 --- a/configure.ac +++ b/configure.ac @@ -1665,6 +1665,12 @@ AC_ARG_ENABLE(avahi, [Determines whether to use Avahi to advertise Impress to remote controls.]) ) +AC_ARG_ENABLE(msvc-debug-runtime, + AS_HELP_STRING([--enable-msvc-debug-runtime], + [Determines whether to use the Microsoft Visual Studio debugging runtime. + Automatically turned on by --enable-dbgutil but not by --enable-debug]) +) + AC_ARG_ENABLE(msvc-analyze, AS_HELP_STRING([--enable-msvc-analyze], [Determines whether to enable the Microsoft Visual Studio /analyze flag to provide additional warnings.]) @@ -4937,7 +4943,11 @@ if test -n "$enable_dbgutil" -a "$enable_dbgutil" != "no"; then fi else ENABLE_DBGUTIL="" - MSVC_USE_DEBUG_RUNTIME="" + if test "$enable_msvc_debug_runtime" = "yes"; then + MSVC_USE_DEBUG_RUNTIME="TRUE" + else + MSVC_USE_DEBUG_RUNTIME="" + fi AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_DBGUTIL) diff --git a/external/libxml2/ExternalProject_libxml2.mk b/external/libxml2/ExternalProject_libxml2.mk index 26005343d24a..e42cc4797477 100644 --- a/external/libxml2/ExternalProject_libxml2.mk +++ b/external/libxml2/ExternalProject_libxml2.mk @@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,libxml2,build): $(call gb_ExternalProject_run,build,\ cscript /e:javascript configure.js \ iconv=no icu=yes sax1=yes $(if $(MSVC_USE_DEBUG_RUNTIME),cruntime=/MDd) \ - $(if $(filter TRUE,$(ENABLE_DBGUTIL)),debug=yes) \ + $(if $(filter TRUE,$(MSVC_USE_DEBUG_RUNTIME)),debug=yes) \ && nmake \ ,win32) $(call gb_Trace_EndRange,libxml2,EXTERNAL)
