Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/generated-configure.sh	Fri Apr 06 04:13:09 2018 -0700
     1.2 +++ b/common/autoconf/generated-configure.sh	Fri Apr 06 04:20:26 2018 -0700
     1.3 @@ -4219,7 +4219,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1523013158
     1.8 +DATE_WHEN_GENERATED=1523013611
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -25733,6 +25733,9 @@
    1.13        VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
    1.14        WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'`
    1.15        WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
    1.16 +      # Remove any paths containing # (typically F#) as that messes up make. This
    1.17 +      # is needed if visual studio was installed with F# support.
    1.18 +      VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[^:#]*#[^:]*://g'`
    1.19  
    1.20  
    1.21  

     2.1 --- a/common/autoconf/toolchain_windows.m4	Fri Apr 06 04:13:09 2018 -0700
     2.2 +++ b/common/autoconf/toolchain_windows.m4	Fri Apr 06 04:20:26 2018 -0700
     2.3 @@ -211,6 +211,9 @@
     2.4        VCINSTALLDIR=`$ECHO "$VCINSTALLDIR" | $SED 's/\\\\* *$//'`
     2.5        WindowsSDKDir=`$ECHO "$WindowsSDKDir" | $SED 's/\\\\* *$//'`
     2.6        WINDOWSSDKDIR=`$ECHO "$WINDOWSSDKDIR" | $SED 's/\\\\* *$//'`
     2.7 +      # Remove any paths containing # (typically F#) as that messes up make. This
     2.8 +      # is needed if visual studio was installed with F# support.
     2.9 +      VS_PATH=`$ECHO "$VS_PATH" | $SED 's/[[^:#]]*#[^:]*://g'`
    2.10  
    2.11        AC_SUBST(VS_PATH)
    2.12        AC_SUBST(VS_INCLUDE)