configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5d15a29f271c09f27a87bce2be2185fd62c635fe
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
AuthorDate: Mon Feb 3 19:32:22 2025 +0100
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Tue Feb 4 11:08:59 2025 +0100
wsl-as-helper: also support winget's version of Git on aarch64
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+libreoff...@googlemail.com>
diff --git a/configure.ac b/configure.ac
index 63bf9c8c14b3..daac9b0a6dbe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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],
