solenv/bin/modules/installer/windows/msiglobal.pm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 918c409e63e72447a351344e9bca394275fe7508
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Thu Aug 14 15:06:58 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Mon Aug 18 12:31:14 2025 +0200
tdf#166947 fix windows installation sets for aarch64
While https://learn.microsoft.com/en-us/windows/win32/msi/template-summary
says that the value should be Arm64 for aarch64, the installsets created
by the baseline fail to install/produce error 1620 on installation
So keep claiming it would be an x86_64 installation.
Change-Id: I4e0717ef5c0a8584b918d3d94187cb84d1c07a11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189604
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index e6e77ea0dbd1..ecc8fbe63912 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -504,7 +504,8 @@ sub get_template_for_sis
if (( $allvariables->{'64BITPRODUCT'} ) && (
$allvariables->{'64BITPRODUCT'} == 1 )) { $architecture = "x64"; }
- $architecture = "Arm64" if($ENV{'RTL_ARCH'} eq "AARCH64");
+ # Windows is not happy when setting this on baseline/gives error 1620 when
trying to launch the installer
+ # $architecture = "Arm64" if($ENV{'RTL_ARCH'} eq "AARCH64");
my $value = "\"" . $architecture . ";" . $windowslanguage; # adding the
Windows language
