Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(224)

Unified Diff: source/acinclude.m4

Issue 845603002: Update ICU to 54.1 step 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master
Patch Set: remove unusued directories Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « source/Makefile.in ('k') | source/aclocal.m4 » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: source/acinclude.m4
diff --git a/source/acinclude.m4 b/source/acinclude.m4
index 5b2c8444b428755393137b4d7624fd795252371b..179c1c827677f944f850129187b4d5e392dc01f2 100644
--- a/source/acinclude.m4
+++ b/source/acinclude.m4
@@ -1,4 +1,4 @@
-# Copyright (c) 1999-2013, International Business Machines Corporation and
+# Copyright (c) 1999-2014, International Business Machines Corporation and
# others. All Rights Reserved.
# acinclude.m4 for ICU
# Don't edit aclocal.m4, do edit acinclude.m4
@@ -32,17 +32,30 @@ 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)
if test "$GCC" = yes; then
- AC_TRY_COMPILE([
-#ifndef __MINGW32__
-#error This is not MinGW
-#endif], [], AC_TRY_COMPILE([
+ 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([[
#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
+ case "${host}" in
+ *-*-mingw*) icu_cv_host_frag=mh-msys-msvc ;;
+ *-*-cygwin) icu_cv_host_frag=mh-cygwin-msvc ;;
+ esac
fi ;;
*-*-*bsd*|*-*-dragonfly*) icu_cv_host_frag=mh-bsd-gcc ;;
*-*-aix*)
@@ -262,7 +275,7 @@ AC_DEFUN([AC_CHECK_64BIT_LIBS],
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`
@@ -457,9 +470,6 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
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
@@ -474,7 +484,9 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
if test "`$CC /help 2>&1 | head -c9`" = "Microsoft"
then
CFLAGS="$CFLAGS /W4"
- fi
+ fi ;;
+ *-*-mingw*)
+ CFLAGS="$CFLAGS -W4" ;;
esac
fi
if test "$GXX" = yes
@@ -486,7 +498,9 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
if test "`$CXX /help 2>&1 | head -c9`" = "Microsoft"
then
CXXFLAGS="$CXXFLAGS /W4"
- fi
+ fi ;;
+ *-*-mingw*)
+ CFLAGS="$CFLAGS -W4" ;;
esac
fi
fi
« no previous file with comments | « source/Makefile.in ('k') | source/aclocal.m4 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698