summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--third_party/yasm/README.chromium3
-rw-r--r--third_party/yasm/source/config/android/config.h2
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