external/onlineupdate/Library_install_updateservice.mk | 2 +- setup_native/Library_instooofiltmsi.mk | 2 +- setup_native/Library_qslnkmsi.mk | 2 +- setup_native/Library_reg4allmsdoc.mk | 2 +- setup_native/Library_reg_dlls.mk | 2 +- setup_native/Library_regactivex.mk | 2 +- setup_native/Library_sdqsmsi.mk | 2 +- setup_native/Library_sellangmsi.mk | 2 +- setup_native/Library_shlxtmsi.mk | 2 +- setup_native/Library_sn_tools.mk | 2 +- setup_native/StaticLibrary_quickstarter.mk | 2 +- setup_native/StaticLibrary_seterror.mk | 2 +- solenv/gbuild/platform/com_MSC_class.mk | 3 ++- 13 files changed, 14 insertions(+), 13 deletions(-)
New commits: commit 975734cc3db4c6737b5bfd90b08583b32d3d1506 Author: Mike Kaganski <[email protected]> AuthorDate: Sun Jan 11 21:03:55 2026 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Mon Jan 12 07:20:13 2026 +0100 Silence warning D9025 : overriding '/MDd' with '/MTd' Slash is consistently replaced with dash at respective parameters. Change-Id: Ia68ffc96e585d4a1fabdefb305d295689baaf458 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197051 Tested-by: Jenkins Reviewed-by: Mike Kaganski <[email protected]> diff --git a/external/onlineupdate/Library_install_updateservice.mk b/external/onlineupdate/Library_install_updateservice.mk index c284f322d7ea..ebd03e51a937 100644 --- a/external/onlineupdate/Library_install_updateservice.mk +++ b/external/onlineupdate/Library_install_updateservice.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Library_add_defs,install_updateservice, \ )) $(eval $(call gb_Library_add_cxxflags,install_updateservice, \ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ $(if $(filter -fsanitize=%,$(CC)),,/fno-sanitize-address-vcasan-lib) \ )) diff --git a/setup_native/Library_instooofiltmsi.mk b/setup_native/Library_instooofiltmsi.mk index 9238a8c5a800..27b23a3f045a 100644 --- a/setup_native/Library_instooofiltmsi.mk +++ b/setup_native/Library_instooofiltmsi.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,instooofiltmsi,\ )) $(eval $(call gb_Library_add_cxxflags,instooofiltmsi,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,instooofiltmsi,\ diff --git a/setup_native/Library_qslnkmsi.mk b/setup_native/Library_qslnkmsi.mk index 4703c403de9c..1a340540487e 100644 --- a/setup_native/Library_qslnkmsi.mk +++ b/setup_native/Library_qslnkmsi.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,qslnkmsi,\ )) $(eval $(call gb_Library_add_cxxflags,qslnkmsi,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,qslnkmsi,\ diff --git a/setup_native/Library_reg4allmsdoc.mk b/setup_native/Library_reg4allmsdoc.mk index bdb63c0f578b..12dc9581f3f9 100644 --- a/setup_native/Library_reg4allmsdoc.mk +++ b/setup_native/Library_reg4allmsdoc.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,reg4allmsdoc,\ )) $(eval $(call gb_Library_add_cxxflags,reg4allmsdoc,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,reg4allmsdoc,\ diff --git a/setup_native/Library_reg_dlls.mk b/setup_native/Library_reg_dlls.mk index 34ecb919f9f7..836b777c9d9f 100644 --- a/setup_native/Library_reg_dlls.mk +++ b/setup_native/Library_reg_dlls.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,reg_dlls,\ )) $(eval $(call gb_Library_add_cxxflags,reg_dlls,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,reg_dlls,\ diff --git a/setup_native/Library_regactivex.mk b/setup_native/Library_regactivex.mk index 7978f8872e55..1a7147a9c154 100644 --- a/setup_native/Library_regactivex.mk +++ b/setup_native/Library_regactivex.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,regactivex,\ )) $(eval $(call gb_Library_add_cxxflags,regactivex,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,regactivex,\ diff --git a/setup_native/Library_sdqsmsi.mk b/setup_native/Library_sdqsmsi.mk index 162d499e62c4..83824fda0d92 100644 --- a/setup_native/Library_sdqsmsi.mk +++ b/setup_native/Library_sdqsmsi.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,sdqsmsi,\ )) $(eval $(call gb_Library_add_cxxflags,sdqsmsi,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,sdqsmsi,\ diff --git a/setup_native/Library_sellangmsi.mk b/setup_native/Library_sellangmsi.mk index b98f2df039fe..8e93bb41b062 100644 --- a/setup_native/Library_sellangmsi.mk +++ b/setup_native/Library_sellangmsi.mk @@ -18,7 +18,7 @@ $(eval $(call gb_Library_add_defs,sellangmsi,\ )) $(eval $(call gb_Library_add_cxxflags,sellangmsi,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,sellangmsi,\ diff --git a/setup_native/Library_shlxtmsi.mk b/setup_native/Library_shlxtmsi.mk index 78653d9bd8f4..f5c721bd7b4e 100644 --- a/setup_native/Library_shlxtmsi.mk +++ b/setup_native/Library_shlxtmsi.mk @@ -16,7 +16,7 @@ $(eval $(call gb_Library_add_defs,shlxtmsi,\ )) $(eval $(call gb_Library_add_cxxflags,shlxtmsi,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,shlxtmsi,\ diff --git a/setup_native/Library_sn_tools.mk b/setup_native/Library_sn_tools.mk index 4a16090cd0de..a36d5cdc14bd 100644 --- a/setup_native/Library_sn_tools.mk +++ b/setup_native/Library_sn_tools.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Library_add_defs,sn_tools,\ )) $(eval $(call gb_Library_add_cxxflags,sn_tools,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_Library_add_ldflags,sn_tools,\ diff --git a/setup_native/StaticLibrary_quickstarter.mk b/setup_native/StaticLibrary_quickstarter.mk index 66dba4534a7b..9a4e809373de 100644 --- a/setup_native/StaticLibrary_quickstarter.mk +++ b/setup_native/StaticLibrary_quickstarter.mk @@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_add_defs,quickstarter,\ )) $(eval $(call gb_StaticLibrary_add_cxxflags,quickstarter,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,quickstarter,\ diff --git a/setup_native/StaticLibrary_seterror.mk b/setup_native/StaticLibrary_seterror.mk index c33b8c2011e0..9ee60bd44c39 100644 --- a/setup_native/StaticLibrary_seterror.mk +++ b/setup_native/StaticLibrary_seterror.mk @@ -14,7 +14,7 @@ $(eval $(call gb_StaticLibrary_add_defs,seterror,\ )) $(eval $(call gb_StaticLibrary_add_cxxflags,seterror,\ - $(if $(MSVC_USE_DEBUG_RUNTIME),/MTd,/MT) \ + $(if $(MSVC_USE_DEBUG_RUNTIME),-MTd,-MT) \ )) $(eval $(call gb_StaticLibrary_add_exception_objects,seterror,\ diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2904dec031d6..3ee7aab2c430 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -40,7 +40,7 @@ endef gb_Helper_remove_overridden_flags = \ $(filter-out -W4 -w -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2 -Od -O2 -Zc:inline -Zc:inline- \ -Zc:dllexportInlines -Zc:dllexportInlines- -EHs -EHa -DNOMINMAX -UNOMINMAX -D_X86_=1 -U_X86_ \ - -D_AMD64_=1 -U_AMD64_ -D_DLL -U_DLL $(MSVC_ANALYZE_FLAGS) -analyze-,$(1)) \ + -D_AMD64_=1 -U_AMD64_ -D_DLL -U_DLL -MD -MDd -MT -MTd $(MSVC_ANALYZE_FLAGS) -analyze-,$(1)) \ $(lastword $(filter -W4 -w,$(1))) \ $(lastword $(filter -Od -O2,$(1))) \ $(lastword $(filter -arch:SSE -arch:SSE2 -arch:AVX -arch:AVX2,$(1))) \ @@ -49,6 +49,7 @@ gb_Helper_remove_overridden_flags = \ $(lastword $(filter -D_X86_=1 -U_X86_,$(1))) \ $(lastword $(filter -D_AMD64_=1 -U_AMD64_,$(1))) \ $(lastword $(filter -D_DLL -U_DLL,$(1))) \ + $(lastword $(filter -MD -MDd -MT -MTd,$(1))) \ $(lastword $(filter -Zc:inline -Zc:inline-,$(1))) \ $(lastword $(filter -Zc:dllexportInlines -Zc:dllexportInlines-,$(1))) \ $(lastword $(filter $(MSVC_ANALYZE_FLAGS) -analyze-,$(1)))
