solenv/bin/modules/installer/download.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2ef1dc48597d85d02576d6b722d1dd784eabf39
Author:     Christian Lohmaier <[email protected]>
AuthorDate: Wed Jun 15 22:06:05 2022 +0200
Commit:     Christian Lohmaier <[email protected]>
CommitDate: Thu Jun 16 16:35:49 2022 +0200

    drop special case for win 64bit download name, use x86-64 consistently
    
    "x64" was introduced in 2013 for the 64bit windows packages in
    efdad0b126abd3c151b545740d0530a0a832d482 for no apparent reason.
    
    Change-Id: Ifae4faaeb99b4e8950cc64bb993d29c0a3ff24dd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135923
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <[email protected]>

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index f46dae735864..ad5f94560751 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -377,7 +377,7 @@ sub get_download_architecture
     }
     elsif ( $installer::globals::cpuname eq 'X86_64' )
     {
-        $arch = $installer::globals::os eq 'WNT' ? 'x64' : 'x86-64';
+        $arch = 'x86-64';
     }
     elsif ( $installer::globals::cpuname eq 'AARCH64' )
     {

Reply via email to