diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 15:28:38 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 15:28:38 +0000 |
| commit | d536c76aba4ec9cdb0b0d23135a6fe00e37d305a (patch) | |
| tree | 587b6a96ee69a2335f343d5d12263fe452e0f1ab /third_party | |
| parent | df691245b39d9eced4d40d311150b9c967e9f4a8 (diff) | |
| download | chromium_src-d536c76aba4ec9cdb0b0d23135a6fe00e37d305a.zip chromium_src-d536c76aba4ec9cdb0b0d23135a6fe00e37d305a.tar.gz chromium_src-d536c76aba4ec9cdb0b0d23135a6fe00e37d305a.tar.bz2 | |
android: disable NLS when building yasm.
When crosscompiling for android on mac hosts, some machines don't have
the NLS header files available. Rather than insist on another build
dependency, just disable NLS when building yasm; we can live without
localisation in a build-time tool.
BUG=
Review URL: https://codereview.chromium.org/146833017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/yasm/README.chromium | 3 | ||||
| -rw-r--r-- | third_party/yasm/source/config/android/config.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium index 7ec7e601..8226f8b 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -37,7 +37,8 @@ Instructions for recreating the yasm.gyp file. 5) Grab the generated Makefile, libyasm-stdint.h, config.h, and put into the correct platform location. For android platform, copy the files - generated for linux. For ios, copy the files from mac. + generated for linux, but make sure that ENABLE_NLS is not defined to + allow mac host compiles to work. For ios, copy the files from mac. src/third_party/yasm/source/config/[platform] diff --git a/third_party/yasm/source/config/android/config.h b/third_party/yasm/source/config/android/config.h index 9e36539..35a50b7 100644 --- a/third_party/yasm/source/config/android/config.h +++ b/third_party/yasm/source/config/android/config.h @@ -5,7 +5,7 @@ #define CPP_PROG "gcc -E" /* */ -#define ENABLE_NLS 1 +/* #undef ENABLE_NLS */ /* Define to 1 if you have the `abort' function. */ #define HAVE_ABORT 1 |