summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunlian Jiang <yunlian@google.com>2017-10-16 10:58:35 -0700
committerYunlian Jiang <yunlian@google.com>2017-10-16 10:58:35 -0700
commita0fdc06dda0f0ce61aeee2a349884b11202ff342 (patch)
tree45c69617a4217ed15e1b63f5f713679db6d9f9e9
parent970ae788db8c30aed7689642bab4772d6b79454e (diff)
downloadgdb-a0fdc06dda0f0ce61aeee2a349884b11202ff342.tar.gz
cherrypick a patch from 7.11
This cherrypicks the commit: 78af0f6: Handle cross compile for locale configuration BUG=None TEST=./checkbuild.py on linux x86 Change-Id: I55ab0c97771b5efc3c317c20e7704bd94cb21a25
-rw-r--r--gdb-8.0.1/gdb/gnulib/configure8
1 files changed, 8 insertions, 0 deletions
diff --git a/gdb-8.0.1/gdb/gnulib/configure b/gdb-8.0.1/gdb/gnulib/configure
index d2141647e..067d2c5c6 100644
--- a/gdb-8.0.1/gdb/gnulib/configure
+++ b/gdb-8.0.1/gdb/gnulib/configure
@@ -10421,6 +10421,8 @@ _ACEOF
$as_echo_n "checking for a traditional japanese locale... " >&6; }
if test "${gt_cv_locale_ja+set}" = set; then :
$as_echo_n "(cached) " >&6
+elif test "$cross_compiling" = yes; then :
+ gt_cv_locale_ja=none
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10560,6 +10562,8 @@ $as_echo "$gt_cv_locale_ja" >&6; }
$as_echo_n "checking for a transitional chinese locale... " >&6; }
if test "${gt_cv_locale_zh_CN+set}" = set; then :
$as_echo_n "(cached) " >&6
+elif test "$cross_compiling" = yes; then :
+ gt_cv_locale_zh_CN=none
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10692,6 +10696,8 @@ $as_echo "$gt_cv_locale_zh_CN" >&6; }
$as_echo_n "checking for a french Unicode locale... " >&6; }
if test "${gt_cv_locale_fr_utf8+set}" = set; then :
$as_echo_n "(cached) " >&6
+elif test "$cross_compiling" = yes; then :
+ gt_cv_locale_fr_utf8=none
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10821,6 +10827,8 @@ $as_echo "$gt_cv_locale_fr_utf8" >&6; }
$as_echo_n "checking for a traditional french locale... " >&6; }
if test "${gt_cv_locale_fr+set}" = set; then :
$as_echo_n "(cached) " >&6
+elif test "$cross_compiling" = yes; then :
+ gt_cv_locale_fr=none
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext