common/autoconf/toolchain.m4
changeset 26400 4d6c6f2df610
parent 25034 d9ca34c227b8
child 27594 e425f93c3dda
equal deleted inserted replaced
26399:cecab64dc33a 26400:4d6c6f2df610
   555     # Setup the resource compiler (RC)
   555     # Setup the resource compiler (RC)
   556     AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc])
   556     AC_CHECK_PROG([RC], [rc], [rc],,, [/usr/bin/rc])
   557     BASIC_FIXUP_EXECUTABLE(RC)
   557     BASIC_FIXUP_EXECUTABLE(RC)
   558     AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
   558     AC_CHECK_PROG([DUMPBIN], [dumpbin], [dumpbin],,,)
   559     BASIC_FIXUP_EXECUTABLE(DUMPBIN)
   559     BASIC_FIXUP_EXECUTABLE(DUMPBIN)
       
   560     # We need to check for 'msbuild.exe' because at the place where we expect to
       
   561     # find 'msbuild.exe' there's also a directory called 'msbuild' and configure
       
   562     # won't find the 'msbuild.exe' executable in that case (and the
       
   563     # 'ac_executable_extensions' is unusable due to performance reasons).
       
   564     # Notice that we intentionally don't fix up the path to MSBUILD because we
       
   565     # will call it in a DOS shell during freetype detection on Windows (see
       
   566     # 'LIB_SETUP_FREETYPE' in "libraries.m4"
       
   567     AC_CHECK_PROG([MSBUILD], [msbuild.exe], [msbuild.exe],,,)
   560   fi
   568   fi
   561 
   569 
   562   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
   570   if test "x$OPENJDK_TARGET_OS" = xsolaris; then
   563     BASIC_PATH_PROGS(STRIP, strip)
   571     BASIC_PATH_PROGS(STRIP, strip)
   564     BASIC_FIXUP_EXECUTABLE(STRIP)
   572     BASIC_FIXUP_EXECUTABLE(STRIP)