mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wsl-as-helper: also support winget's version of Git on aarch64

Browse Source 
the current version of Git.Git apparently is now available in a version
compiled for arm64 specifically, so also look for clangarm64 is PATH to
properly detect git-bash / wsl-as-helper method in that case

Change-Id: I3668220b7231cfa8e998b742f4357f7a1e9b4823
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181075
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
This commit is contained in:
Christian Lohmaier
2025-02-03 19:32:22 +01:00
parent fc4445dc36
commit 5d15a29f27
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@@ -316,11 +316,11 @@ dnl checks build and host OSes
dnl do this before argument processing to allow for platform dependent defaults
dnl ===================================================================
# are we running in wsl but are called from git-bash/env with mingw64 in path?
# are we running in wsl but are called from git-bash/env with mingw64 or clangarm64 in path?
# if so, we aim to run nearly everything in the Windows realm, and only run autogen/configure
# in wsl and run a few tools via wsl
WSL_ONLY_AS_HELPER=
if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q mingw64); then
if test -n "$WSL_DISTRO_NAME" && $(echo $PATH |grep -q -e mingw64 -e clangarm64); then
WSL_ONLY_AS_HELPER=TRUE
AC_ARG_WITH([strawberry-perl-portable],
[AS_HELP_STRING([--with-strawberry-perl-portable],