# HG changeset patch
# User kevinw
# Date 1523013626 25200
# Node ID cddffb220808ff3c078cd818e6a6d25d130f0726
# Parent  feba63b3fa369860b558418c8ef0e5c727323df5
8039030: 9-dev windows-i586 build failed with mktemp: command not found
Reviewed-by: erikj, alanb, katleman

diff -r feba63b3fa36 -r cddffb220808 common/autoconf/generated-configure.sh
--- a/common/autoconf/generated-configure.sh	Fri Apr 06 04:13:09 2018 -0700
+++ b/common/autoconf/generated-configure.sh	Fri Apr 06 04:20:26 2018 -0700
@@ -4219,7 +4219,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1523013158
+DATE_WHEN_GENERATED=1523013611
 
 ###############################################################################
 #
@@ -25733,6 +25733,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'`
 
 
 
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)