changeset 23432:f8964bac59db

8039030: 9-dev windows-i586 build failed with mktemp: command not found Reviewed-by: alanb, katleman
author erikj
date Fri, 04 Apr 2014 17:10:44 +0200
parents 588e6a7ebd01
children afe67de12b7d da98aef02483
files common/autoconf/generated-configure.sh common/autoconf/toolchain_windows.m4
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh	Tue Apr 01 17:25:15 2014 -0700
+++ b/common/autoconf/generated-configure.sh	Fri Apr 04 17:10:44 2014 +0200
@@ -4243,7 +4243,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1396297437
+DATE_WHEN_GENERATED=1396624161
 
 ###############################################################################
 #
@@ -27449,6 +27449,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'`
 
 
 
--- a/common/autoconf/toolchain_windows.m4	Tue Apr 01 17:25:15 2014 -0700
+++ b/common/autoconf/toolchain_windows.m4	Fri Apr 04 17:10:44 2014 +0200
@@ -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)