organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-10 07:39:16 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-5803 Porting fixes for MinGW

Browse source 
X-SVN-Rev: 22148
This commit is contained in:
George Rhoten 2007-07-26 06:42:56 +00:00
parent 1d44c52660
commit 2a97497038
3 changed files with 62 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
icu4c/source/aclocal.m4 vendored
View file

@ -26,22 +26,19 @@ alpha*-*-linux-gnu)
fi ;;
powerpc*-*-linux*)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-linux
icu_cv_host_frag=mh-linux
else
icu_cv_host_frag=mh-linux-va
icu_cv_host_frag=mh-linux-va
fi ;;
*-*-linux*) icu_cv_host_frag=mh-linux ;;
*-*-cygwin)
*-*-cygwin|*-*-mingw32)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-cygwin
AC_TRY_COMPILE([
#ifndef __MINGW32__
#error This is not MinGW
#endif], [], icu_cv_host_frag=mh-mingw, icu_cv_host_frag=mh-cygwin)
else
icu_cv_host_frag=mh-cygwin-msvc
fi ;;
*-*-mingw32)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-mingw
else
icu_cv_host_frag=mh-cygwin-msvc
icu_cv_host_frag=mh-cygwin-msvc
fi ;;
*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;;
*-*-aix*)

3
icu4c/source/config/mh-mingw
View file

@ -71,7 +71,8 @@ LIBICU = $(STATIC_PREFIX_WHEN_USED)$(ICUPREFIX)
# The #M# is used to delete lines for icu-config
# Current full path directory.
CURR_FULL_DIR=$(shell pwd -W)#M#
#CURR_FULL_DIR=$(shell pwd -W)#M# for MSYS
CURR_FULL_DIR=$(subst \,/,$(shell cmd /c cd | tail --bytes=+3))#M# for Cygwin shell
# Current full path directory for use in source code in a -D compiler option.
CURR_SRCCODE_FULL_DIR=$(subst /,\\\\,$(shell pwd -W))#M#

63
icu4c/source/configure vendored
View file

@ -3380,22 +3380,63 @@ alpha*-*-linux-gnu)
fi ;;
powerpc*-*-linux*)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-linux
icu_cv_host_frag=mh-linux
else
icu_cv_host_frag=mh-linux-va
icu_cv_host_frag=mh-linux-va
fi ;;
*-*-linux*) icu_cv_host_frag=mh-linux ;;
*-*-cygwin)
*-*-cygwin|*-*-mingw32)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-cygwin
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#ifndef __MINGW32__
#error This is not MinGW
#endif
int
main ()
{
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest.$ac_objext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
icu_cv_host_frag=mh-mingw
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
icu_cv_host_frag=mh-cygwin
fi
rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
else
icu_cv_host_frag=mh-cygwin-msvc
fi ;;
*-*-mingw32)
if test "$GCC" = yes; then
icu_cv_host_frag=mh-mingw
else
icu_cv_host_frag=mh-cygwin-msvc
icu_cv_host_frag=mh-cygwin-msvc
fi ;;
*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;;
*-*-aix*)