From f41f6c2b41673f8fc3729e87a126b194a562340a Mon Sep 17 00:00:00 2001
From: "jochen@chromium.org"
 <jochen@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 18 Sep 2013 08:11:44 +0000
Subject: [PATCH] Turn on i18n support by default

BUG=v8:2745
R=danno@chromium.org

Review URL: https://codereview.chromium.org/23003028

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16783 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 Makefile              | 6 +++---
 Makefile.nacl         | 3 +++
 build/features.gypi   | 2 +-
 build/standalone.gypi | 2 +-
 samples/samples.gyp   | 2 +-
 src/d8.gyp            | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 288c25739..2679a5025 100644
--- a/Makefile
+++ b/Makefile
@@ -124,9 +124,9 @@ endif
 ifeq ($(regexp), interpreted)
   GYPFLAGS += -Dv8_interpreted_regexp=1
 endif
-# i18nsupport=on
-ifeq ($(i18nsupport), on)
-  GYPFLAGS += -Dv8_enable_i18n_support=1
+# i18nsupport=off
+ifeq ($(i18nsupport), off)
+  GYPFLAGS += -Dv8_enable_i18n_support=0
 endif
 # arm specific flags.
 # armv7=false/true
diff --git a/Makefile.nacl b/Makefile.nacl
index 02e83ef2b..2c79ef113 100644
--- a/Makefile.nacl
+++ b/Makefile.nacl
@@ -74,6 +74,9 @@ endif
 # For mksnapshot host generation.
 GYPENV += host_os=${HOST_OS}
 
+# ICU doesn't support NaCl.
+GYPENV += v8_enable_i18n_support=0
+
 NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_ARCHES))
 .SECONDEXPANSION:
 # For some reason the $$(basename $$@) expansion didn't work here...
diff --git a/build/features.gypi b/build/features.gypi
index 3c6d25f75..5343284db 100644
--- a/build/features.gypi
+++ b/build/features.gypi
@@ -54,7 +54,7 @@
 
     # Enable ECMAScript Internationalization API. Enabling this feature will
     # add a dependency on the ICU library.
-    'v8_enable_i18n_support%': 0,
+    'v8_enable_i18n_support%': 1,
   },
   'target_defaults': {
     'conditions': [
diff --git a/build/standalone.gypi b/build/standalone.gypi
index f18333127..3d4f8049a 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -36,7 +36,7 @@
     'clang%': 0,
     'visibility%': 'hidden',
     'v8_enable_backtrace%': 0,
-    'v8_enable_i18n_support%': 0,
+    'v8_enable_i18n_support%': 1,
     'msvs_multi_core_compile%': '1',
     'mac_deployment_target%': '10.5',
     'variables': {
diff --git a/samples/samples.gyp b/samples/samples.gyp
index c93deca4f..dfc741007 100644
--- a/samples/samples.gyp
+++ b/samples/samples.gyp
@@ -28,7 +28,7 @@
 {
   'variables': {
     'v8_code': 1,
-    'v8_enable_i18n_support%': 0,
+    'v8_enable_i18n_support%': 1,
   },
   'includes': ['../build/toolchain.gypi', '../build/features.gypi'],
   'target_defaults': {
diff --git a/src/d8.gyp b/src/d8.gyp
index c033fd7e4..097abc046 100644
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -31,7 +31,7 @@
     'console%': '',
     # Enable support for Intel VTune. Supported on ia32/x64 only
     'v8_enable_vtunejit%': 0,
-    'v8_enable_i18n_support%': 0,
+    'v8_enable_i18n_support%': 1,
   },
   'includes': ['../build/toolchain.gypi', '../build/features.gypi'],
   'targets': [
-- 
2.34.1