scp2/source/ooo/vc_redist.scp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
New commits: commit 57c5a6a723da2166698c55665dfc49e399b9b7a7 Author: Christian Lohmaier <[email protected]> AuthorDate: Thu Jan 22 14:52:21 2026 +0100 Commit: Adolfo Jayme Barrientos <[email protected]> CommitDate: Fri Jan 23 10:07:20 2026 +0100 tdf#169371 bundle visual studio crt on windows aarch64 turns out that the merge module for x64 file actually also contains arm64 versions of the dlls. Change-Id: I8d8f5c848201eea28c95e62eebf4baca31f292d8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197829 Reviewed-by: Christian Lohmaier <[email protected]> Tested-by: Jenkins (cherry picked from commit 1b8f881bfd25ff3ca9d2ba937a6be43a9c7bfbd8) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/197911 Reviewed-by: Adolfo Jayme Barrientos <[email protected]> diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 523e5d5e8d88..64f72761ecd1 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -59,7 +59,8 @@ End #endif -#if defined(WINDOWS_X64) && defined(WINDOWS_X64_MERGEMODULE) +/* merge modules file for x64 contains the arm64 ones */ +#if (defined(WINDOWS_X64) || defined(WINDOWS_AARCH64)) && defined(WINDOWS_X64_MERGEMODULE) /* Attributes: msidbComponentAttributesPermanent = 0x10 */ MergeModule WINDOWS_X64_MERGEMODULE
