Version 5.5.228.1 (cherry-pick)

src/d8.gyp

Index: src/d8.gyp
diff --git a/src/d8.gyp b/src/d8.gyp
index e0270f5178de6216edf45f08ab803d2f6b1ae34e..cc65a5b75a6c290e2bc36caaee857c3a852ea58d 100644
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -49,18 +49,10 @@
       'sources': [
         'd8.h',
         'd8.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
       ],
       'conditions': [
         [ 'want_separate_host_toolset==1', {
           'toolsets': [ 'target', ],
-          'dependencies': [
-            'd8_js2c#host',
-          ],
-        }, {
-          'dependencies': [
-            'd8_js2c',
-          ],
         }],
         ['(OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="netbsd" \
            or OS=="openbsd" or OS=="solaris" or OS=="android" \
@@ -71,7 +63,19 @@
           'sources': [ 'd8-windows.cc', ]
         }],
         [ 'component!="shared_library"', {
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
+          ],
           'conditions': [
+            [ 'want_separate_host_toolset==1', {
+              'dependencies': [
+                'd8_js2c#host',
+              ],
+            }, {
+              'dependencies': [
+                'd8_js2c',
+              ],
+            }],
             [ 'v8_postmortem_support=="true"', {
               'xcode_settings': {
                 'OTHER_LDFLAGS': [