configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 6edd93671c491938e52fce75a64f48f8a63d08a1
Author: Balázs Varga (allotropia) <balazs.varga.ext...@allotropia.de>
AuthorDate: Thu Nov 10 13:52:21 2022 +0100
Commit: Balazs Varga <balazs.varga.ext...@allotropia.de>
CommitDate: Mon Nov 21 11:18:35 2022 +0100
Revert "use uname for detecting WSL"
Since this patch breaks WSL2 builds on windows.
This reverts commit 5a8a1c4a86938b65c5ea7807f60e721946d7d8de.
Change-Id: Idd68a2609b81881af87ae777b5c4bf9cc2d8ef88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142580
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.varga.ext...@allotropia.de>
diff --git a/configure.ac b/configure.ac
index cef05a5893d9..52476b46d14a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -302,9 +302,9 @@ dnl checks build and host OSes
dnl do this before argument processing to allow for platform dependent defaults
dnl ===================================================================
-# Check for WSL. But if --host is explicitly specified (to really do build for
+# Check for WSL (version 2, at least). But if --host is explicitly specified
(to really do build for
# Linux on WSL) trust that.
-if test -z "$host" -a -z "$build" -a "$(uname -r | grep -i Microsoft
2>/dev/null)" != ""; then
+if test -z "$host" -a -z "$build" -a "`wslsys -v 2>/dev/null`" != ""; then
ac_cv_host="x86_64-pc-wsl"
ac_cv_host_cpu="x86_64"
ac_cv_host_os="wsl"
