ICU-11121 Fix cygwin msvc mh file detection

X-SVN-Rev: 36253

diff --git a/icu4c/source/acinclude.m4 b/icu4c/source/acinclude.m4
index e051ed0f24eef795daeb3ec7e819d48bf7253cc6..25e1eaa1db0ff9eea3d84ac7b961822fc8ecac88 100644 (file)
--- a/icu4c/source/acinclude.m4
+++ b/icu4c/source/acinclude.m4
@@ -32,8 +32,18 @@ powerpc*-*-linux*)
                icu_cv_host_frag=mh-linux-va
        fi ;;
 *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
-i[[34567]]86-*-cygwin) icu_cv_host_frag=mh-cygwin ;;
-x86_64-*-cygwin) icu_cv_host_frag=mh-cygwin64 ;;
+i[[34567]]86-*-cygwin) 
+       if test "$GCC" = yes; then
+               icu_cv_host_frag=mh-cygwin
+       else
+               icu_cv_host_frag=mh-cygwin-msvc
+       fi ;;
+x86_64-*-cygwin) 
+       if test "$GCC" = yes; then
+               icu_cv_host_frag=mh-cygwin64
+       else
+               icu_cv_host_frag=mh-cygwin-msvc
+       fi ;;
 *-*-mingw*)
        if test "$GCC" = yes; then
                 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[

diff --git a/icu4c/source/configure b/icu4c/source/configure
index 81c13b7ab2f4351364f8de23af6c14eaa8cf4552..26fbfa0751eb4c057d90a794cf78eb9406a76dec 100755 (executable)
--- a/icu4c/source/configure
+++ b/icu4c/source/configure
@@ -4892,8 +4892,18 @@ powerpc*-*-linux*)
                icu_cv_host_frag=mh-linux-va
        fi ;;
 *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
-i[34567]86-*-cygwin) icu_cv_host_frag=mh-cygwin ;;
-x86_64-*-cygwin) icu_cv_host_frag=mh-cygwin64 ;;
+i[34567]86-*-cygwin)
+       if test "$GCC" = yes; then
+               icu_cv_host_frag=mh-cygwin
+       else
+               icu_cv_host_frag=mh-cygwin-msvc
+       fi ;;
+x86_64-*-cygwin)
+       if test "$GCC" = yes; then
+               icu_cv_host_frag=mh-cygwin64
+       else
+               icu_cv_host_frag=mh-cygwin-msvc
+       fi ;;
 *-*-mingw*)
        if test "$GCC" = yes; then
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext