Merge revision 8899 from bleeding_edge

tools/gyp/v8.gyp

Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index 7a36d823675ace56068607c3e403057ae1e13890..e755fcb926b5b47e1a73db99c172fa418ee3dc18 100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -319,10 +319,13 @@
             }],
             # The ARM assembler assumes the host is 32 bits,
             # so force building 32-bit host tools.
-            ['v8_target_arch=="arm" and host_arch=="x64" and \
-              _toolset=="host"', {
-              'cflags': ['-m32'],
-              'ldflags': ['-m32'],
+            ['v8_target_arch=="arm" and host_arch=="x64"', {
+              'target_conditions': [
+                ['_toolset=="host"', {
+                  'cflags': ['-m32'],
+                  'ldflags': ['-m32'],
+                }],
+              ],
             }],
             ['component=="shared_library"', {
               'conditions': [
@@ -429,10 +432,13 @@
           'conditions': [
             # The ARM assembler assumes the host is 32 bits,
             # so force building 32-bit host tools.
-            ['v8_target_arch=="arm" and host_arch=="x64" and \
-              _toolset=="host"', {
-              'cflags': ['-m32'],
-              'ldflags': ['-m32'],
+            ['v8_target_arch=="arm" and host_arch=="x64"', {
+              'target_conditions': [
+                ['_toolset=="host"', {
+                  'cflags': ['-m32'],
+                  'ldflags': ['-m32'],
+                }],
+              ],
             }],
             ['want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
@@ -748,9 +754,13 @@
               'conditions': [
                 # The ARM assembler assumes the host is 32 bits,
                 # so force building 32-bit host tools.
-                ['host_arch=="x64" and _toolset=="host"', {
-                  'cflags': ['-m32'],
-                  'ldflags': ['-m32'],
+                ['host_arch=="x64"', {
+                  'target_conditions': [
+                    ['_toolset=="host"', {
+                      'cflags': ['-m32'],
+                      'ldflags': ['-m32'],
+                    }],
+                  ],
                 }],
               ],
             }],
@@ -993,10 +1003,13 @@
             }],
             # The ARM assembler assumes the host is 32 bits,
             # so force building 32-bit host tools.
-            ['v8_target_arch=="arm" and host_arch=="x64" and \
-              _toolset=="host"', {
-              'cflags': ['-m32'],
-              'ldflags': ['-m32'],
+            ['v8_target_arch=="arm" and host_arch=="x64"', {
+              'target_conditions': [
+                ['_toolset=="host"', {
+                  'cflags': ['-m32'],
+                  'ldflags': ['-m32'],
+                }],
+              ],
             }],
             ['v8_compress_startup_data=="bz2"', {
               'libraries': [
@@ -1065,10 +1078,13 @@
             }],
             # The ARM assembler assumes the host is 32 bits,
             # so force building 32-bit host tools.
-            ['v8_target_arch=="arm" and host_arch=="x64" and \
-              _toolset=="host"', {
-              'cflags': ['-m32'],
-              'ldflags': ['-m32'],
+            ['v8_target_arch=="arm" and host_arch=="x64"', {
+              'target_conditions': [
+                ['_toolset=="host"', {
+                  'cflags': ['-m32'],
+                  'ldflags': ['-m32'],
+                }],
+              ],
             }],
           ],
           'link_settings': {