common/autoconf/toolchain_windows.m4

changeset 525
bd32ef0789ca
parent 522
98a7af257bee
child 637
52741ab7c601
     1.1 --- a/common/autoconf/toolchain_windows.m4	Wed Dec 05 10:12:14 2012 +0100
     1.2 +++ b/common/autoconf/toolchain_windows.m4	Wed Dec 05 16:35:25 2012 +0100
     1.3 @@ -48,7 +48,12 @@
     1.4      METHOD="$2"
     1.5      BASIC_WINDOWS_REWRITE_AS_UNIX_PATH(WIN_SDK_BASE)
     1.6      if test -d "$WIN_SDK_BASE"; then
     1.7 -      if test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
     1.8 +      # There have been cases of partial or broken SDK installations. A missing
     1.9 +      # lib dir is not going to work.
    1.10 +      if test ! -d "$WIN_SDK_BASE/../lib"; then
    1.11 +        AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
    1.12 +        AC_MSG_NOTICE([Warning: Installation is broken, lib dir is missing. Ignoring])
    1.13 +      elif test -f "$WIN_SDK_BASE/SetEnv.Cmd"; then
    1.14          AC_MSG_NOTICE([Found Windows SDK installation at $WIN_SDK_BASE using $METHOD])
    1.15          VS_ENV_CMD="$WIN_SDK_BASE/SetEnv.Cmd"
    1.16          if test "x$OPENJDK_TARGET_CPU_BITS" = x32; then

mercurial