From c7f971c23b908335ab5cfb3117bb4d6fe544a664 Mon Sep 17 00:00:00 2001
From: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Date: Wed, 15 Jun 2022 22:04:14 +0200
Subject: fix download-filename for Windows aarch64 builds

was incorrectly using x64

Change-Id: Ieb7c90c6b1ed3abd73315a15c59490ea639954c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135922
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
---
 solenv/bin/modules/installer/download.pm  | 13 +------------
 solenv/bin/modules/installer/globals.pm   |  1 -
 solenv/bin/modules/installer/parameter.pm | 11 +----------
 3 files changed, 2 insertions(+), 23 deletions(-)

(limited to 'solenv')

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index ca270fe563a9..f46dae735864 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -363,17 +363,6 @@ sub get_download_architecture
     {
         $arch = "x86";
     }
-    elsif ( $installer::globals::iswindowsbuild )
-    {
-        if ( $installer::globals::iswin64build )
-        {
-            $arch = "x64";
-        }
-        else
-        {
-            $arch = "x86";
-        }
-    }
     elsif ( $installer::globals::cpuname eq 'INTEL' )
     {
         $arch = "x86";
@@ -388,7 +377,7 @@ sub get_download_architecture
     }
     elsif ( $installer::globals::cpuname eq 'X86_64' )
     {
-        $arch = "x86-64";
+        $arch = $installer::globals::os eq 'WNT' ? 'x64' : 'x86-64';
     }
     elsif ( $installer::globals::cpuname eq 'AARCH64' )
     {
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 11442ef202a8..5bbaef309145 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -46,7 +46,6 @@ BEGIN
     $languages_defined_in_productlist = 0;
     $setupscript_defined_in_productlist = 0;
     $iswindowsbuild = 0;
-    $iswin64build = 0;
     $islinuxbuild = 0;
     $isrpmbuild = 0;
     $isdebbuild = 0;
diff --git a/solenv/bin/modules/installer/parameter.pm b/solenv/bin/modules/installer/parameter.pm
index 8f259c3e9a32..befed72024a0 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -241,16 +241,7 @@ sub setglobalvariables
 
     if ( $installer::globals::os eq 'WNT' )
     {
-        if ( $installer::globals::cpuname eq 'INTEL')
-        {
-            $installer::globals::iswindowsbuild = 1;
-            $installer::globals::iswin64build = 0;
-        }
-        else
-        {
-            $installer::globals::iswindowsbuild = 1;
-            $installer::globals::iswin64build = 1;
-        }
+        $installer::globals::iswindowsbuild = 1;
     }
 
     if ( $installer::globals::os eq 'SOLARIS')
-- 
cgit