On 04/04/2014 11:21, Erik Joelsson 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'`
This looks okay to me and seems to match the original fix [1].
-Alan
[1] http://hg.openjdk.java.net/jdk9/dev/rev/0d0c983a817b