make/autoconf/basics.m4

*** 221,230 ****
--- 221,232 ----
    if test "x[$]$1" != x; then
      if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
        BASIC_FIXUP_PATH_CYGWIN($1)
      elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
        BASIC_FIXUP_PATH_MSYS($1)
+     elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+       BASIC_FIXUP_PATH_WSL($1)
      else
        # We're on a unix platform. Hooray! :)
        path="[$]$1"
        has_space=`$ECHO "$path" | $GREP " "`
        if test "x$has_space" != x; then
*** 268,277 ****
--- 270,281 ----
    if test "x[$]$1" != x; then
      if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
        BASIC_FIXUP_EXECUTABLE_CYGWIN($1)
      elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
        BASIC_FIXUP_EXECUTABLE_MSYS($1)
+     elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+       BASIC_FIXUP_EXECUTABLE_WSL($1)
      else
        # We're on a unix platform. Hooray! :)
        # First separate the path from the arguments. This will split at the first
        # space.
        complete="[$]$1"
*** 605,618 ****
--- 609,625 ----
    # Always use the bash builtin pwd to get uniform behavior.
    THEPWDCMD=pwd
  
    # These are not required on all platforms
    BASIC_PATH_PROGS(CYGPATH, cygpath)
+   BASIC_PATH_PROGS(WSLPATH, wslpath)
    BASIC_PATH_PROGS(DF, df)
    BASIC_PATH_PROGS(CPIO, [cpio bsdcpio])
    BASIC_PATH_PROGS(NICE, nice)
    BASIC_PATH_PROGS(PANDOC, pandoc)
+ 
+   BASIC_PATH_PROGS(CMD, [cmd.exe /mnt/c/Windows/System32/cmd.exe])
  ])
  
  ###############################################################################
  # Setup basic configuration paths, and platform-specific stuff related to PATHs.
  AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
*** 632,643 ****
--- 639,652 ----
    if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
      PATH_SEP=";"
      BASIC_CHECK_PATHS_WINDOWS
    else
      PATH_SEP=":"
+         EXECUTABLE_SUFFIX=""
    fi
    AC_SUBST(PATH_SEP)
+   AC_SUBST(EXECUTABLE_SUFFIX)
  
    # We get the top-level directory from the supporting wrappers.
    AC_MSG_CHECKING([for top-level directory])
    AC_MSG_RESULT([$TOPDIR])
    AC_SUBST(TOPDIR)
*** 978,987 ****
--- 987,998 ----
          if test "x$OPENJDK_BUILD_OS" = "xwindows"; then
            if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then
              MAKE_EXPECTED_ENV='cygwin'
            elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then
              MAKE_EXPECTED_ENV='msys'
+           elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.wsl"; then
+             MAKE_EXPECTED_ENV='x86_64-pc-linux-gnu'
            else
              AC_MSG_ERROR([Unknown Windows environment])
            fi
            MAKE_BUILT_FOR=`$MAKE_CANDIDATE --version | $GREP -i 'built for'`
            IS_MAKE_CORRECT_ENV=`$ECHO $MAKE_BUILT_FOR | $GREP $MAKE_EXPECTED_ENV`