diff -r feba63b3fa36 -r cddffb220808 common/autoconf/toolchain_windows.m4
--- a/common/autoconf/toolchain_windows.m4	Fri Apr 06 04:13:09 2018 -0700
+++ b/common/autoconf/toolchain_windows.m4	Fri Apr 06 04:20:26 2018 -0700
@@ -211,6 +211,9 @@
       VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
       WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'`
       WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
+      # Remove any paths containing # (typically F#) as that messes up make. This
+      # is needed if visual studio was installed with F# support.
+      VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'`
 
       AC_SUBST(VS_PATH)
       AC_SUBST(VS_INCLUDE)