summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-21 07:57:18 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-02-21 07:57:18 +0000
commit9d2e92b7fd687b0d979e04bc440af4c787536a5c (patch)
tree9ef5de38a6583545c2684aa2eda8842253a660f2 /Build/source
parent420939e12600615d87f26925f49a238d265a27fc (diff)
libs/icu: Cygwin64 build fix
git-svn-id: svn://tug.org/texlive/trunk@33018 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/libs/icu/icu-52.1-PATCHES/ChangeLog4
-rw-r--r--Build/source/libs/icu/icu-52.1-PATCHES/patch-11-cygwin64214
-rw-r--r--Build/source/libs/icu/icu-52.1/source/acinclude.m412
-rw-r--r--Build/source/libs/icu/icu-52.1/source/config/mh-cygwin64141
-rwxr-xr-xBuild/source/libs/icu/icu-52.1/source/configure23
5 files changed, 368 insertions, 26 deletions
diff --git a/Build/source/libs/icu/icu-52.1-PATCHES/ChangeLog b/Build/source/libs/icu/icu-52.1-PATCHES/ChangeLog
index 39993adec4b..a3ecc5f9dfa 100644
--- a/Build/source/libs/icu/icu-52.1-PATCHES/ChangeLog
+++ b/Build/source/libs/icu/icu-52.1-PATCHES/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-20 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-11-cygwin64 (new): Enable Cygwin64 (from Cygwin64 port).
+
2013-10-10 Peter Breitenlohner <peb@mppmu.mpg.de>
Updated icu-52.1 source tree (icu4c-52_1-src.tgz) from:
diff --git a/Build/source/libs/icu/icu-52.1-PATCHES/patch-11-cygwin64 b/Build/source/libs/icu/icu-52.1-PATCHES/patch-11-cygwin64
new file mode 100644
index 00000000000..51d278438bf
--- /dev/null
+++ b/Build/source/libs/icu/icu-52.1-PATCHES/patch-11-cygwin64
@@ -0,0 +1,214 @@
+diff -ur -N -x config.guess -x config.sub -x install-sh icu-52.1.orig/source/acinclude.m4 icu-52.1/source/acinclude.m4
+--- icu-52.1.orig/source/acinclude.m4 2013-10-04 22:54:58.000000000 +0200
++++ icu-52.1/source/acinclude.m4 2014-02-20 16:43:01.000000000 +0100
+@@ -32,15 +32,15 @@
+ icu_cv_host_frag=mh-linux-va
+ fi ;;
+ *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
+-*-*-cygwin|*-*-mingw32|*-*-mingw64)
++i[[34567]]86-*-cygwin) icu_cv_host_frag=mh-cygwin ;;
++x86_64-*-cygwin) icu_cv_host_frag=mh-cygwin64 ;;
++*-*-mingw32|*-*-mingw64)
+ if test "$GCC" = yes; then
+- AC_TRY_COMPILE([
+-#ifndef __MINGW32__
+-#error This is not MinGW
+-#endif], [], AC_TRY_COMPILE([
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+ #ifndef __MINGW64__
+ #error This is not MinGW64
+-#endif], [], icu_cv_host_frag=mh-mingw64, icu_cv_host_frag=mh-mingw), icu_cv_host_frag=mh-cygwin)
++#endif]])], [icu_cv_host_frag=mh-mingw64],
++ [icu_cv_host_frag=mh-mingw])])
+ else
+ icu_cv_host_frag=mh-cygwin-msvc
+ fi ;;
+diff -ur -N -x config.guess -x config.sub -x install-sh icu-52.1.orig/source/config/mh-cygwin64 icu-52.1/source/config/mh-cygwin64
+--- icu-52.1.orig/source/config/mh-cygwin64 1970-01-01 01:00:00.000000000 +0100
++++ icu-52.1/source/config/mh-cygwin64 2014-02-20 13:25:31.000000000 +0100
+@@ -0,0 +1,141 @@
++## -*-makefile-*-
++## Cygwin64-specific setup
++## Copyright (c) 2014, International Business Machines Corporation and
++## others. All Rights Reserved.
++
++## Commands to generate dependency files
++GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
++GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
++
++## Flags to create/use a static library
++ifneq ($(ENABLE_SHARED),YES)
++## Make sure that the static libraries can be built and used
++CPPFLAGS += -DU_STATIC_IMPLEMENTATION
++else
++## Make sure that the static libraries can be built
++STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
++endif
++
++## Flags for position independent code
++SHAREDLIBCFLAGS =
++SHAREDLIBCXXFLAGS =
++SHAREDLIBCPPFLAGS = -DPIC
++
++## Additional flags when building libraries and with threads
++THREADSCPPFLAGS = -D_REENTRANT
++LIBCPPFLAGS =
++
++# Commands to link. Link with C++ in case static libraries are used.
++LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
++#LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
++
++## Shared library options
++LD_SOOPTIONS= -Wl,-Bsymbolic
++
++## Commands to make a shared library
++# $(subst) won't work in shell script. #M# at the end omits these
++# lines from the shell script (Make only)
++SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(subst cyg,lib,$@).$(A)#M#
++SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(subst cyg,lib,$@).$(A)#M#
++# the #SH# lines don't go through further postprocessing.
++# so, they must be valid shell script starting from column 4
++#SH#SHLIB_c="$(CC) $(CFLAGS) $(LDFLAGS) -shared "
++#SH#SHLIB_cc="$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared "
++
++
++## Compiler switch to embed a runtime search path
++LD_RPATH=
++LD_RPATH_PRE= -Wl,-rpath,
++
++## Compiler switch to embed a library name
++LD_SONAME =
++
++## Shared object suffix
++SO = dll
++## Non-shared intermediate object suffix
++STATIC_O = ao
++LIBICU = cyg$(ICUPREFIX)
++## To have an import library is better on Cygwin
++IMPORT_LIB_EXT = .dll.a
++
++## Compilation rules
++%.$(STATIC_O): $(srcdir)/%.c
++ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
++%.o: $(srcdir)/%.c
++ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
++
++%.$(STATIC_O): $(srcdir)/%.cpp
++ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
++%.o: $(srcdir)/%.cpp
++ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
++
++
++## Dependency rules
++%.d: $(srcdir)/%.c
++ @echo "generating dependency information for $<"
++ @echo -n "$@ " > $@
++ @$(GEN_DEPS.c) $< >> $@ || (rm -f $@ && FALSE)
++
++%.d: $(srcdir)/%.cpp
++ @echo "generating dependency information for $<"
++ @echo -n "$@ " > $@
++ @$(GEN_DEPS.cc) $< >> $@ || (rm -f $@ && FALSE)
++
++## Versioned target for a shared library.
++## Since symbolic links don't work the same way on Windows,
++## we only use the version major number.
++#FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
++FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
++MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
++
++IMPORT_LIB = $(subst cyg,lib,$(FINAL_SO_TARGET)).$(A)#M#
++MIDDLE_IMPORT_LIB = $(subst cyg,lib,$(basename $(SO_TARGET)))$(SO_TARGET_VERSION_MAJOR).$(SO).$(A)#M#
++FINAL_IMPORT_LIB = $(IMPORT_LIB)#M#
++
++# The following is for Makefile.inc's use.
++ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
++
++## Versioned libraries rules
++#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
++# $(RM) $@ && cp ${<F} $@
++%.$(SO): %$(SO_TARGET_VERSION_MAJOR).$(SO)
++ $(RM) $(subst cyg,lib,$@).$(A) && ln -s $(subst cyg,lib,${<F}).$(A) $(subst cyg,lib,$@).$(A)
++
++## Install libraries as executable
++INSTALL-L=$(INSTALL_PROGRAM)
++
++## Bind internal references
++
++# LDflags that pkgdata will use
++BIR_LDFLAGS= -Wl,-Bsymbolic
++
++# Dependencies [i.e. map files] for the final library
++BIR_DEPS=
++
++# Environment variable to set a runtime search path
++LDLIBRARYPATH_ENVVAR = PATH
++
++# The type of assembly to write for generating an object file
++GENCCODE_ASSEMBLY=-a gcc-mingw64
++
++# put this here again so it gets cyguc...
++
++#SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
++
++# for icu-config
++
++#SH### copied from Makefile.inc
++#SH#ICULIBS_COMMON="-l${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_DATA="-l${LIBICU}${DATA_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_I18N="-l${LIBICU}${I18N_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_TOOLUTIL="-l${LIBICU}tu${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_CTESTFW="-l${LIBICU}ctestfw${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_ICUIO="-l${LIBICU}io${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_OBSOLETE="-l${LIBICU}obsolete${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_LAYOUT="-l${LIBICU}le${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_LAYOUTEX="-l${LIBICU}lx${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
++#SH#ICULIBS_BASE="${LIBS} -L${libdir}"
++#SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}"
++
++## End Cygwin-specific setup
++
+diff -ur -N -x config.guess -x config.sub -x install-sh icu-52.1.orig/source/configure icu-52.1/source/configure
+--- icu-52.1.orig/source/configure 2013-10-04 22:54:58.000000000 +0200
++++ icu-52.1/source/configure 2014-02-20 16:43:04.000000000 +0100
+@@ -4873,26 +4873,13 @@
+ icu_cv_host_frag=mh-linux-va
+ fi ;;
+ *-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
+-*-*-cygwin|*-*-mingw32|*-*-mingw64)
++i[[34567]]86-*-cygwin) icu_cv_host_frag=mh-cygwin ;;
++x86_64-*-cygwin) icu_cv_host_frag=mh-cygwin64 ;;
++*-*-mingw32|*-*-mingw64)
+ if test "$GCC" = yes; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+-#ifndef __MINGW32__
+-#error This is not MinGW
+-#endif
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+ #ifndef __MINGW64__
+ #error This is not MinGW64
+ #endif
+@@ -4910,10 +4897,6 @@
+ icu_cv_host_frag=mh-mingw
+ fi
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-else
+- icu_cv_host_frag=mh-cygwin
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+ icu_cv_host_frag=mh-cygwin-msvc
+ fi ;;
diff --git a/Build/source/libs/icu/icu-52.1/source/acinclude.m4 b/Build/source/libs/icu/icu-52.1/source/acinclude.m4
index 5b2c8444b42..4fc08432d84 100644
--- a/Build/source/libs/icu/icu-52.1/source/acinclude.m4
+++ b/Build/source/libs/icu/icu-52.1/source/acinclude.m4
@@ -32,15 +32,15 @@ powerpc*-*-linux*)
icu_cv_host_frag=mh-linux-va
fi ;;
*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
-*-*-cygwin|*-*-mingw32|*-*-mingw64)
+i[[34567]]86-*-cygwin) icu_cv_host_frag=mh-cygwin ;;
+x86_64-*-cygwin) icu_cv_host_frag=mh-cygwin64 ;;
+*-*-mingw32|*-*-mingw64)
if test "$GCC" = yes; then
- AC_TRY_COMPILE([
-#ifndef __MINGW32__
-#error This is not MinGW
-#endif], [], AC_TRY_COMPILE([
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#ifndef __MINGW64__
#error This is not MinGW64
-#endif], [], icu_cv_host_frag=mh-mingw64, icu_cv_host_frag=mh-mingw), icu_cv_host_frag=mh-cygwin)
+#endif]])], [icu_cv_host_frag=mh-mingw64],
+ [icu_cv_host_frag=mh-mingw])])
else
icu_cv_host_frag=mh-cygwin-msvc
fi ;;
diff --git a/Build/source/libs/icu/icu-52.1/source/config/mh-cygwin64 b/Build/source/libs/icu/icu-52.1/source/config/mh-cygwin64
new file mode 100644
index 00000000000..a30dd3c8f1b
--- /dev/null
+++ b/Build/source/libs/icu/icu-52.1/source/config/mh-cygwin64
@@ -0,0 +1,141 @@
+## -*-makefile-*-
+## Cygwin64-specific setup
+## Copyright (c) 2014, International Business Machines Corporation and
+## others. All Rights Reserved.
+
+## Commands to generate dependency files
+GEN_DEPS.c= $(CC) -E -MM $(DEFS) $(CPPFLAGS)
+GEN_DEPS.cc= $(CXX) -E -MM $(DEFS) $(CPPFLAGS)
+
+## Flags to create/use a static library
+ifneq ($(ENABLE_SHARED),YES)
+## Make sure that the static libraries can be built and used
+CPPFLAGS += -DU_STATIC_IMPLEMENTATION
+else
+## Make sure that the static libraries can be built
+STATICCPPFLAGS = -DU_STATIC_IMPLEMENTATION
+endif
+
+## Flags for position independent code
+SHAREDLIBCFLAGS =
+SHAREDLIBCXXFLAGS =
+SHAREDLIBCPPFLAGS = -DPIC
+
+## Additional flags when building libraries and with threads
+THREADSCPPFLAGS = -D_REENTRANT
+LIBCPPFLAGS =
+
+# Commands to link. Link with C++ in case static libraries are used.
+LINK.c= $(CXX) $(CXXFLAGS) $(LDFLAGS)
+#LINK.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS)
+
+## Shared library options
+LD_SOOPTIONS= -Wl,-Bsymbolic
+
+## Commands to make a shared library
+# $(subst) won't work in shell script. #M# at the end omits these
+# lines from the shell script (Make only)
+SHLIB.c= $(CC) $(CFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(subst cyg,lib,$@).$(A)#M#
+SHLIB.cc= $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(LD_SOOPTIONS) -Wl,--enable-auto-import -Wl,--out-implib=$(subst cyg,lib,$@).$(A)#M#
+# the #SH# lines don't go through further postprocessing.
+# so, they must be valid shell script starting from column 4
+#SH#SHLIB_c="$(CC) $(CFLAGS) $(LDFLAGS) -shared "
+#SH#SHLIB_cc="$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared "
+
+
+## Compiler switch to embed a runtime search path
+LD_RPATH=
+LD_RPATH_PRE= -Wl,-rpath,
+
+## Compiler switch to embed a library name
+LD_SONAME =
+
+## Shared object suffix
+SO = dll
+## Non-shared intermediate object suffix
+STATIC_O = ao
+LIBICU = cyg$(ICUPREFIX)
+## To have an import library is better on Cygwin
+IMPORT_LIB_EXT = .dll.a
+
+## Compilation rules
+%.$(STATIC_O): $(srcdir)/%.c
+ $(COMPILE.c) $(STATICCPPFLAGS) $(STATICCFLAGS) -o $@ $<
+%.o: $(srcdir)/%.c
+ $(COMPILE.c) $(DYNAMICCPPFLAGS) $(DYNAMICCFLAGS) -o $@ $<
+
+%.$(STATIC_O): $(srcdir)/%.cpp
+ $(COMPILE.cc) $(STATICCPPFLAGS) $(STATICCXXFLAGS) -o $@ $<
+%.o: $(srcdir)/%.cpp
+ $(COMPILE.cc) $(DYNAMICCPPFLAGS) $(DYNAMICCXXFLAGS) -o $@ $<
+
+
+## Dependency rules
+%.d: $(srcdir)/%.c
+ @echo "generating dependency information for $<"
+ @echo -n "$@ " > $@
+ @$(GEN_DEPS.c) $< >> $@ || (rm -f $@ && FALSE)
+
+%.d: $(srcdir)/%.cpp
+ @echo "generating dependency information for $<"
+ @echo -n "$@ " > $@
+ @$(GEN_DEPS.cc) $< >> $@ || (rm -f $@ && FALSE)
+
+## Versioned target for a shared library.
+## Since symbolic links don't work the same way on Windows,
+## we only use the version major number.
+#FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION).$(SO)
+FINAL_SO_TARGET=$(basename $(SO_TARGET))$(SO_TARGET_VERSION_MAJOR).$(SO)
+MIDDLE_SO_TARGET=$(FINAL_SO_TARGET)
+
+IMPORT_LIB = $(subst cyg,lib,$(FINAL_SO_TARGET)).$(A)#M#
+MIDDLE_IMPORT_LIB = $(subst cyg,lib,$(basename $(SO_TARGET)))$(SO_TARGET_VERSION_MAJOR).$(SO).$(A)#M#
+FINAL_IMPORT_LIB = $(IMPORT_LIB)#M#
+
+# The following is for Makefile.inc's use.
+ICULIBSUFFIX_VERSION = $(LIB_VERSION_MAJOR)
+
+## Versioned libraries rules
+#%$(SO_TARGET_VERSION_MAJOR).$(SO): %$(SO_TARGET_VERSION).$(SO)
+# $(RM) $@ && cp ${<F} $@
+%.$(SO): %$(SO_TARGET_VERSION_MAJOR).$(SO)
+ $(RM) $(subst cyg,lib,$@).$(A) && ln -s $(subst cyg,lib,${<F}).$(A) $(subst cyg,lib,$@).$(A)
+
+## Install libraries as executable
+INSTALL-L=$(INSTALL_PROGRAM)
+
+## Bind internal references
+
+# LDflags that pkgdata will use
+BIR_LDFLAGS= -Wl,-Bsymbolic
+
+# Dependencies [i.e. map files] for the final library
+BIR_DEPS=
+
+# Environment variable to set a runtime search path
+LDLIBRARYPATH_ENVVAR = PATH
+
+# The type of assembly to write for generating an object file
+GENCCODE_ASSEMBLY=-a gcc-mingw64
+
+# put this here again so it gets cyguc...
+
+#SH#ICULIBS_COMMON_LIB_NAME="${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}.${SO}"
+
+# for icu-config
+
+#SH### copied from Makefile.inc
+#SH#ICULIBS_COMMON="-l${LIBICU}uc${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_DATA="-l${LIBICU}${DATA_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_I18N="-l${LIBICU}${I18N_STUBNAME}${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_TOOLUTIL="-l${LIBICU}tu${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_CTESTFW="-l${LIBICU}ctestfw${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_ICUIO="-l${LIBICU}io${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_OBSOLETE="-l${LIBICU}obsolete${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_LAYOUT="-l${LIBICU}le${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_LAYOUTEX="-l${LIBICU}lx${ICULIBSUFFIX}${ICULIBSUFFIX_VERSION}"
+#SH#ICULIBS_BASE="${LIBS} -L${libdir}"
+#SH#ICULIBS="${ICULIBS_BASE} ${ICULIBS_I18N} ${ICULIBS_COMMON} ${ICULIBS_DATA}"
+
+## End Cygwin-specific setup
+
diff --git a/Build/source/libs/icu/icu-52.1/source/configure b/Build/source/libs/icu/icu-52.1/source/configure
index 340ad6fa39e..9f73ffcd5c7 100755
--- a/Build/source/libs/icu/icu-52.1/source/configure
+++ b/Build/source/libs/icu/icu-52.1/source/configure
@@ -4873,26 +4873,13 @@ powerpc*-*-linux*)
icu_cv_host_frag=mh-linux-va
fi ;;
*-*-linux*|*-*-gnu|*-*-k*bsd*-gnu|*-*-kopensolaris*-gnu) icu_cv_host_frag=mh-linux ;;
-*-*-cygwin|*-*-mingw32|*-*-mingw64)
+i[[34567]]86-*-cygwin) icu_cv_host_frag=mh-cygwin ;;
+x86_64-*-cygwin) icu_cv_host_frag=mh-cygwin64 ;;
+*-*-mingw32|*-*-mingw64)
if test "$GCC" = yes; then
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#ifndef __MINGW32__
-#error This is not MinGW
-#endif
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
#ifndef __MINGW64__
#error This is not MinGW64
#endif
@@ -4910,10 +4897,6 @@ else
icu_cv_host_frag=mh-mingw
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- icu_cv_host_frag=mh-cygwin
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
else
icu_cv_host_frag=mh-cygwin-msvc
fi ;;