Correct gyp toolsets for all combinations of want_separate_host_toolset and use_system_icu.

icu.gyp

Index: icu.gyp
diff --git a/icu.gyp b/icu.gyp
index 38d29397b8401f524780f99cedb0216b9320f6b7..4900ab2b22fe8cab268cdb9a1194e7800b89ca9b 100644
--- a/icu.gyp
+++ b/icu.gyp
@@ -69,11 +69,15 @@
              'mac/icudt46l_dat.S',
           ],
           'conditions': [
-            [ 'use_system_icu==1', {
+            [ 'use_system_icu==1 and want_separate_host_toolset==1', {
               'toolsets': ['host'],
-            }, {
+            }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==0', {
+              'toolsets': ['target'],
+            }],
             [ 'OS == "win" and icu_use_data_file_flag==0', {
               'type': 'none',
               'copies': [
@@ -122,7 +126,7 @@
               '(OS != "android" or _toolset != "host" or host_os != "mac")', {
               'sources!': ['mac/icudt46l_dat.S'],
             }],
-          ],
+          ], # target_conditions
         },
         {
           'target_name': 'icui18n',
@@ -142,11 +146,15 @@
             ],
           },
           'conditions': [
-            [ 'use_system_icu==1', {
+            [ 'use_system_icu==1 and want_separate_host_toolset==1', {
               'toolsets': ['host'],
-            }, {
+            }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==0', {
+              'toolsets': ['target'],
+            }],
             [ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
               # Since ICU wants to internally use its own deprecated APIs, don't
               # complain about it.
@@ -218,7 +226,7 @@
                 }],
               ],
             }],
-          ],
+          ], # conditions
         },
         {
           'target_name': 'icuuc',
@@ -245,11 +253,15 @@
             ],
           },
           'conditions': [
-            [ 'use_system_icu==1', {
+            [ 'use_system_icu==1 and want_separate_host_toolset==1', {
               'toolsets': ['host'],
-            }, {
+            }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==1', {
               'toolsets': ['host', 'target'],
             }],
+            [ 'use_system_icu==0 and want_separate_host_toolset==0', {
+              'toolsets': ['target'],
+            }],
             [ 'OS == "win"', {
               'sources': [
                 'source/stubdata/stubdata.c',
@@ -318,9 +330,9 @@
                 '-Wno-switch',
               ],
             }],
-          ],
+          ], # conditions
         },
-      ],
+      ], # targets
     }],
     ['use_system_icu==1', {
       'targets': [
@@ -328,11 +340,6 @@
           'target_name': 'system_icu',
           'type': 'none',
           'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['target'],
-            }, {
-              'toolsets': ['host', 'target'],
-            }],
             ['OS=="android"', {
               'direct_dependent_settings': {
                 'include_dirs': [
@@ -363,13 +370,7 @@
           'type': 'none',
           'dependencies': ['system_icu'],
           'export_dependent_settings': ['system_icu'],
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['target'],
-            }, {
-              'toolsets': ['host', 'target'],
-            }],
-          ],
+          'toolsets': ['target'],
         },
         {
           'target_name': 'icui18n',
@@ -456,13 +457,7 @@
           'includes': [
             '../../build/shim_headers.gypi',
           ],
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['target'],
-            }, {
-              'toolsets': ['host', 'target'],
-            }],
-          ],
+          'toolsets': ['target'],
         },
         {
           'target_name': 'icuuc',
@@ -567,15 +562,9 @@
           'includes': [
             '../../build/shim_headers.gypi',
           ],
-          'conditions': [
-            ['want_separate_host_toolset==1', {
-              'toolsets': ['target'],
-            }, {
-              'toolsets': ['host', 'target'],
-            }],
-          ],
+          'toolsets': ['target'],
         },
-      ],
+      ], # targets
     }],
-  ],
+  ], # conditions
 }