From 5d5b8293cabe8324ecab7f631195cce4acc53bde Mon Sep 17 00:00:00 2001 From: Michael Ow Date: Mon, 25 Aug 2014 22:07:21 +0000 Subject: [PATCH] ICU-10857 Remove mingw suffix and update configure X-SVN-Rev: 36233 --- icu4c/source/acinclude.m4 | 2 +- icu4c/source/configure | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/icu4c/source/acinclude.m4 b/icu4c/source/acinclude.m4 index 797a2963770..e051ed0f24e 100644 --- a/icu4c/source/acinclude.m4 +++ b/icu4c/source/acinclude.m4 @@ -34,7 +34,7 @@ powerpc*-*-linux*) *-*-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 ;; -*-*-mingw32|*-*-mingw64) +*-*-mingw*) if test "$GCC" = yes; then AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #ifndef __MINGW64__ diff --git a/icu4c/source/configure b/icu4c/source/configure index 863a42b73cd..81c13b7ab2f 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -4105,9 +4105,6 @@ $as_echo "$ac_use_strict_options" >&6; } if test "$GCC" = yes then case "${host}" in - *-*-solaris*) - # Don't use -std=c99 option on Solaris/GCC - ;; *) # Do not use -ansi. It limits us to C90, and it breaks some platforms. # We use -std=c99 to disable the gnu99 defaults and its associated warnings @@ -4600,7 +4597,7 @@ fi if test "$CAN_BUILD_64" != yes; then # Nope. back out changes. CFLAGS="${CFLAGS_OLD}" - CXXFLAGS="${CFLAGS_OLD}" + CXXFLAGS="${CXXFLAGS_OLD}" # 2. try xarch=v9 [deprecated] ## TODO: cross compile: the following won't work. SPARCV9=`isainfo -n 2>&1 | grep sparcv9` @@ -4897,7 +4894,7 @@ powerpc*-*-linux*) *-*-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 ;; -*-*-mingw32|*-*-mingw64) +*-*-mingw*) if test "$GCC" = yes; then cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -- 2.40.0