Merge branch 'dgud/fix-wsl-builds'

* dgud/fix-wsl-builds:
  Use wsl openssl
  Look for dump files to make them visible in monitor
  Fix tests on WSL
  Check argv size
  Add WSL shell variable for makefiles
  erts: Move erts_get_ethread_info implementation
  kernel: Find executable from WSLPATH on windows
  Fix ERTS_SKIP_DEPEND
  Fix CLASSPATH with wsl
  Fix executable extensions
  Extend MSVC install paths

1 files changed, 18 insertions, 1 deletions

diff --git a/otp_build b/otp_build
index 52da262fcf..caace59357 100755
--- a/otp_build
+++ b/otp_build
@@ -812,7 +812,24 @@ setup_win32_cl_env ()
     echo_setenv LIB "$LIB" ';'
     echo_setenv LIBPATH "$LIBPATH" ';'
     echo_setenv VCToolsRedistDir "$VCToolsRedistDir" ';'
-    echo_setenv WSLENV "$WSLENV" ';'
+    echo_setenv WSLENV "$WSLENV:WSLPATH/l:CLASSPATH/l" ';'
+
+    save_ifs=$IFS
+    IFS=:
+    WSLPATH=""
+    for p in $PATH; do
+	if [ -d "$p" ]; then
+	    case "$p" in
+		/mnt/c/*)
+		    WSLPATH=$WSLPATH:$p
+		    ;;
+		*)
+		    ;;
+	    esac
+	fi
+    done
+    IFS=$save_ifs
+    echo_setenv WSLPATH "$WSLPATH" ';'
 }
 
 lookup_prog_in_path ()