1.1 --- a/common/autoconf/toolchain.m4 Tue Apr 17 09:33:36 2018 -0700
1.2 +++ b/common/autoconf/toolchain.m4 Wed Apr 18 02:21:14 2018 -0700
1.3 @@ -674,6 +674,14 @@
1.4 BASIC_FIXUP_EXECUTABLE(RC)
1.5 AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
1.6 BASIC_FIXUP_EXECUTABLE(DUMPBIN)
1.7 + # We need to check for 'msbuild.exe' because at the place where we expect to
1.8 + # find 'msbuild.exe' there's also a directory called 'msbuild' and configure
1.9 + # won't find the 'msbuild.exe' executable in that case (and the
1.10 + # 'ac_executable_extensions' is unusable due to performance reasons).
1.11 + # Notice that we intentionally don't fix up the path to MSBUILD because we
1.12 + # will call it in a DOS shell during freetype detection on Windows (see
1.13 + # 'LIB_SETUP_FREETYPE' in "libraries.m4"
1.14 + AC_CHECK_PROG([MSBUILD], [msbuild.exe], [msbuild.exe],,,)
1.15 fi
1.16
1.17 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
