--- old/make/autoconf/toolchain_windows.m4	2019-04-03 08:29:42.000000000 -0700
+++ new/make/autoconf/toolchain_windows.m4	2019-04-03 08:29:42.000000000 -0700
@@ -472,7 +472,7 @@
       # Change directory so we don't need to mess with Windows paths in redirects.
       cd $VS_ENV_TMP_DIR
       $CMD /c extract-vs-env.bat | $CAT
-      cd $CURDIR
+      cd $CONFIGURE_START_DIR
 
       if test ! -s $VS_ENV_TMP_DIR/set-vs-env.sh; then
         AC_MSG_NOTICE([Could not succesfully extract the environment variables needed for the VS setup.])