On Apr 4, 2014, at 3:21 AM, Erik Joelsson <erik.joels...@oracle.com> wrote:
>
> Please review this re-fix of the F# on the path problem on windows. This was
> fixed before in JDK-8009315, but was unfortunately reverted by JDK-8035751.
> This patch readds the filtering of path entries containing '#' from the path.
>
> Original bug: https://bugs.openjdk.java.net/browse/JDK-8009315
> New bug: https://bugs.openjdk.java.net/browse/JDK-8039030
> Patch inline:
>
> diff -r 54dd5b81ed46 common/autoconf/toolchain_windows.m4
> --- a/common/autoconf/toolchain_windows.m4 Tue Apr 01 17:25:15 2014 -0700
> +++ b/common/autoconf/toolchain_windows.m4 Fri Apr 04 12:17:30 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)
Same sed pattern that was used in the earlier iteration of toolchain_windows.m4
Approved!
Thanks for the quick turn Erik!
Dave
