configure.ac | 3 +--
solenv/bin/modules/installer/windows/msiglobal.pm | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit fdc77b3c40f8fb4091ebe15c670522877644b75e
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Fri Apr 11 12:49:14 2025 +0200
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Apr 11 20:39:55 2025 +0200
fix msi generation on native windows/aarch64
msidb and other tools from the arm directory are incompatible, so it
needs the intel ones instead
Change-Id: I9029ab3c78708ec5e2b81085597c67ff10ffc188
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184032
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
(cherry picked from commit 6b10b00d7d4d877d98c92ae81c9482fd76486a85)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184041
diff --git a/configure.ac b/configure.ac
index afe8127323a0..ff9e3ab16df5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15779,8 +15779,7 @@ else
fi
if test "$WIN_BUILD_ARCH" = "arm64"; then
# needed for msi packaging - as of 10.0.22621 SDK no arm64 ones yet
- # the x86 ones probably would work just as well...
- pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/arm" "before"
+ pathmunge "$WINDOWS_SDK_BINDIR_NO_ARCH/x86" "before"
fi
# .NET 4.6 and higher don't have bin directory
if test -f "$DOTNET_FRAMEWORK_HOME/bin"; then
diff --git a/solenv/bin/modules/installer/windows/msiglobal.pm
b/solenv/bin/modules/installer/windows/msiglobal.pm
index 51e91af12be3..3b392c4fd4a1 100644
--- a/solenv/bin/modules/installer/windows/msiglobal.pm
+++ b/solenv/bin/modules/installer/windows/msiglobal.pm
@@ -524,6 +524,8 @@ sub get_template_for_sis
if (( $allvariables->{'64BITPRODUCT'} ) && (
$allvariables->{'64BITPRODUCT'} == 1 )) { $architecture = "x64"; }
+ $architecture = "Arm64" if($ENV{'RTL_ARCH'} eq "AARCH64");
+
my $value = "\"" . $architecture . ";" . $windowslanguage; # adding the
Windows language
$value = $value . "\""; # adding ending '"'
