configure.ac | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 07f028e706420ddb9a955222fb6ebab046be237a
Author: Tor Lillqvist <[email protected]>
AuthorDate: Sun Oct 25 00:53:30 2020 +0300
Commit: Tor Lillqvist <[email protected]>
CommitDate: Sun Oct 25 01:14:10 2020 +0200
Set also ac_cv_{build,host}_{cpu,os} in the case of building for Windows on
WSL
Change-Id: I095f5169c0e9969531995ff0b533642aeaae9135
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104759
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <[email protected]>
diff --git a/configure.ac b/configure.ac
index 67d1cbad9d3a..1584480f84bf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,7 +210,11 @@ dnl
===================================================================
# Linux on WSL) trust that.
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"
ac_cv_build="$ac_cv_host"
+ ac_cv_build_cpu="$ac_cv_host_cpu"
+ ac_cv_build_os="$ac_cv_host_os"
# Emulation of Cygwin's cygpath command for WSL.
cygpath()
@@ -308,6 +312,7 @@ if test -z "$host" -a -z "$build" -a "`wslsys -v
2>/dev/null`" != ""; then
fi
AC_CANONICAL_HOST
+AC_CANONICAL_BUILD
AC_MSG_CHECKING([for product name])
PRODUCTNAME="AC_PACKAGE_NAME"
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
