Applied and tested and works for me. Approved.
/Erik
On 2013-07-09 15:28, Tim Bell wrote:
Erik -
It looks for strings not containing : or #, followed by a #, then no
: followed by a :. The double brackets seemed necessary as m4 would
eat them otherwise.
I'll take your version with thanks!
Updated webrev:
http://cr.openjdk.java.net/~tbell/8009315/webrev.01/
Tim
On 07/ 9/13 06:08 AM, Erik Joelsson wrote:
This patch isn't working for me. On my setup, the F# path ends up
first and the regexp is expecting to find an initial colon:
's/:.*#[^:]*:/:/'. My own workaround for this problem looks like this:
diff -r 50d2bde060f2 common/autoconf/toolchain_windows.m4
--- a/common/autoconf/toolchain_windows.m4
+++ b/common/autoconf/toolchain_windows.m4
@@ -208,6 +208,8 @@
# Remove any trailing \ from INCLUDE and LIB to avoid trouble
in spec.gmk
.
VS_INCLUDE=`$ECHO "$INCLUDE" | $SED 's/\\\\$//'`
VS_LIB=`$ECHO "$LIB" | $SED 's/\\\\$//'`
+ # Remove any paths containing # (typically F#) as that messes up make
+ PATH=`$ECHO "$PATH" | $SED 's/[[^:#]]*#[^:]*://g'`
VS_PATH="$PATH"
AC_SUBST(VS_INCLUDE)
AC_SUBST(VS_LIB)
It looks for strings not containing : or #, followed by a #, then no
: followed by a :. The double brackets seemed necessary as m4 would
eat them otherwise.
/Erik
On 2013-07-09 14:19, Tim Bell wrote:
Hello
Here is the bug report:
http://bugs.sun.com/view_bug.do?bug_id=8009315
With Visual Studio 2010 this is an issue only for users who install F#.
With VS 2012, F# is always installed and this becomes a stopper
issue for all Windows users trying to build.
I'd like to get this small fix out of the way.
http://cr.openjdk.java.net/~tbell/8009315/webrev.00/
Thanks in advance-
Tim
