configure.ac | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
New commits: commit f0b282b6edc6317b3768f85de5debbfba7bb0c2b Author: Tor Lillqvist <[email protected]> AuthorDate: Sun Oct 25 02:22:54 2020 +0300 Commit: Tor Lillqvist <[email protected]> CommitDate: Sun Oct 25 07:38:33 2020 +0100 More cases of treating wsl like cygwin Change-Id: I7ae3c86fc42d5232b168a55d1993ad373075b773 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104765 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <[email protected]> diff --git a/configure.ac b/configure.ac index 7580e90413fb..985bfb0eb68f 100644 --- a/configure.ac +++ b/configure.ac @@ -3555,7 +3555,7 @@ reg_get_value_64() } case "$host_os" in -cygwin*) +cygwin*|wsl*) COM=MSC USING_X11= OS=WNT @@ -4603,7 +4603,7 @@ aix*) P_SEP=: ;; -cygwin*) +cygwin*|wsl*) # Already handled ;; @@ -8312,7 +8312,7 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread" ;; - cygwin*) + cygwin*|wsl*) JAVAINC="-I$JAVA_HOME/include/win32" JAVAINC="$JAVAINC -I$JAVA_HOME/include" ;; @@ -13932,7 +13932,7 @@ AC_SUBST(TEMP_DIRECTORY) if test -n "$LO_PATH_FOR_BUILD"; then LO_PATH="$LO_PATH_FOR_BUILD" case "$host_os" in - cygwin*) + cygwin*|wsl*) pathmunge "$MSVC_HOST_PATH" "before" ;; esac @@ -13947,7 +13947,7 @@ else fi ;; - cygwin*) + cygwin*|wsl*) # Win32 make needs native paths if test "$GNUMAKE_WIN_NATIVE" = "TRUE" ; then LO_PATH=`cygpath -p -m "$PATH"` _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
