diff options
author | Mike Stroyan <stroyan@google.com> | 2016-10-27 14:06:45 -0600 |
---|---|---|
committer | Mike Stroyan <stroyan@google.com> | 2016-10-27 14:06:45 -0600 |
commit | 78af0f6ffb98bc9afee887e58e2f01875e69abc4 (patch) | |
tree | 5591c5c2e71f8c3243790bfdeccfe5e7c1b0ca4e | |
parent | 6b4897a1e418cf776d2bab7e8d55c28e2d77506f (diff) | |
download | gdb-78af0f6ffb98bc9afee887e58e2f01875e69abc4.tar.gz |
Handle cross compile for locale configurationndk-r15-beta2ndk-r15-beta1ndk-r14-beta2ndk-r14-beta1ndk-r14ndk-r15-releasendk-r14-release
Make gdb-7.11/gdb/gnulib/configure always check cross_compiling.
Four locale checks were running executables to discover that.
Running android executables on linux can hang a build.
Test: ./checkbuild.py on linux x86
Bug: http://b/31347799
Change-Id: I3ca8977eb4b226c74c9d822033c733314cd7ed59
-rw-r--r-- | gdb-7.11/gdb/gnulib/configure | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gdb-7.11/gdb/gnulib/configure b/gdb-7.11/gdb/gnulib/configure index 540bad302..e8e2da2e5 100644 --- a/gdb-7.11/gdb/gnulib/configure +++ b/gdb-7.11/gdb/gnulib/configure @@ -10133,6 +10133,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 @@ -10272,6 +10274,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 @@ -10404,6 +10408,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 @@ -10533,6 +10539,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 |