Mercurial > hg > icedtea8-forest
changeset 2394:cddffb220808
8039030: 9-dev windows-i586 build failed with mktemp: command not found
Reviewed-by: erikj, alanb, katleman
| author | kevinw |
|---|---|
| date | Fri, 06 Apr 2018 04:20:26 -0700 |
| parents | feba63b3fa36 |
| children | a05ed58d5ae0 |
| 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 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'`
--- 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)