make/autoconf/basic_windows.m4

*** 1,7 ****
  #
! # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 146,161 ****
        fixpath_argument_list=`echo $all_unique_prefixes  | tr ' ' '@'`
        FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
      elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.wsl; then
        FIXPATH="$FIXPATH_BIN -w"
      fi
      FIXPATH_SRC_W="$FIXPATH_SRC"
      FIXPATH_BIN_W="$FIXPATH_BIN"
      UTIL_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W])
      UTIL_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
-     $RM -rf $FIXPATH_BIN $FIXPATH_DIR
-     $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
      cd $FIXPATH_DIR
      $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
      cd $CONFIGURE_START_DIR
  
      if test ! -x $FIXPATH_BIN; then
--- 146,161 ----
        fixpath_argument_list=`echo $all_unique_prefixes  | tr ' ' '@'`
        FIXPATH="$FIXPATH_BIN -m$fixpath_argument_list"
      elif test "x$OPENJDK_BUILD_OS_ENV" = xwindows.wsl; then
        FIXPATH="$FIXPATH_BIN -w"
      fi
+     $RM -rf $FIXPATH_BIN $FIXPATH_DIR
+     $MKDIR -p $FIXPATH_DIR $CONFIGURESUPPORT_OUTPUTDIR/bin
      FIXPATH_SRC_W="$FIXPATH_SRC"
      FIXPATH_BIN_W="$FIXPATH_BIN"
      UTIL_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_SRC_W])
      UTIL_REWRITE_AS_WINDOWS_MIXED_PATH([FIXPATH_BIN_W])
      cd $FIXPATH_DIR
      $CC $FIXPATH_SRC_W -Fe$FIXPATH_BIN_W > $FIXPATH_DIR/fixpath1.log 2>&1
      cd $CONFIGURE_START_DIR
  
      if test ! -x $FIXPATH_BIN; then