Index: src/d8.gyp |
diff --git a/src/d8.gyp b/src/d8.gyp |
index d2b42540388ea9133a1ccaa75274e2954876841e..2d9af7807a05a77bf17200b4deb02efa8e895a63 100644 |
--- a/src/d8.gyp |
+++ b/src/d8.gyp |
@@ -47,9 +47,17 @@ |
], |
'conditions': [ |
[ 'component!="shared_library"', { |
- 'dependencies': [ 'd8_js2c#host', ], |
'sources': [ 'd8-debug.cc', '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc', ], |
'conditions': [ |
+ [ 'want_separate_host_toolset==1', { |
+ 'dependencies': [ |
+ 'd8_js2c#host', |
+ ], |
+ }, { |
+ 'dependencies': [ |
+ 'd8_js2c', |
+ ], |
+ }], |
[ 'console=="readline"', { |
'libraries': [ '-lreadline', ], |
'sources': [ 'd8-readline.cc' ], |
@@ -68,13 +76,19 @@ |
{ |
'target_name': 'd8_js2c', |
'type': 'none', |
- 'toolsets': ['host'], |
'variables': { |
'js_files': [ |
'd8.js', |
'macros.py', |
], |
}, |
+ 'conditions': [ |
+ [ 'want_separate_host_toolset==1', { |
+ 'toolsets': ['host'], |
+ }, { |
+ 'toolsets': ['target'], |
+ }] |
+ ], |
'actions': [ |
{ |
'action_name': 'd8_js2c', |
@@ -90,6 +104,7 @@ |
'../tools/js2c.py', |
'<@(_outputs)', |
'D8', |
+ 'off', # compress startup data |
'<@(js_files)' |
], |
}, |