diff -r bfb0c4f25f0f -r 79641c886929 common/autoconf/toolchain_windows.m4
--- a/common/autoconf/toolchain_windows.m4	Thu Apr 09 17:35:56 2015 -0700
+++ b/common/autoconf/toolchain_windows.m4	Fri Apr 10 16:32:00 2015 +0200
@@ -270,7 +270,7 @@
     AC_MSG_NOTICE([Trying to extract Visual Studio environment variables])
 
     # We need to create a couple of temporary files.
-    VS_ENV_TMP_DIR="$OUTPUT_ROOT/vs-env"
+    VS_ENV_TMP_DIR="$CONFIGURESUPPORT_OUTPUTDIR/vs-env"
     $MKDIR -p $VS_ENV_TMP_DIR
 
     # Cannot use the VS10 setup script directly (since it only updates the DOS subshell environment).