Skip to content

build,deps,v8: loose ends #26666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2019
Merged

build,deps,v8: loose ends #26666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions deps/v8/gypfiles/inspector.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
{
'action_name': 'protocol_compatibility',
'inputs': [
'<(inspector_path)/js_protocol.json',
'<(inspector_path)/js_protocol.pdl',
],
'outputs': [
'<@(SHARED_INTERMEDIATE_DIR)/src/js_protocol.stamp',
Expand All @@ -99,14 +99,14 @@
'python',
'<(protocol_path)/check_protocol_compatibility.py',
'--stamp', '<@(_outputs)',
'<(inspector_path)/js_protocol.json',
'<@(_inputs)',
],
'message': 'Checking inspector protocol compatibility',
},
{
'action_name': 'protocol_generated_sources',
'inputs': [
'<(inspector_path)/js_protocol.json',
'<(inspector_path)/js_protocol.pdl',
'<(inspector_path)/inspector_protocol_config.json',
'<@(inspector_protocol_files)',
],
Expand Down
29 changes: 12 additions & 17 deletions deps/v8/gypfiles/v8.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
'v8_random_seed%': 314159265,
'v8_vector_stores%': 0,
'v8_embed_script%': "",
# Placeholder. For upstream V8, this includes test files that Node.js does not need.
'v8_extra_library_files%': [],
'mksnapshot_exec': '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
'v8_os_page_size%': 0,
Expand Down Expand Up @@ -418,12 +419,16 @@
'toolsets': ['host', 'target'],
'dependencies': [
'mksnapshot#host',
'js2c#host',
'js2c_extras#host', # TODO(refack) get rid of this.
# This has effectively become a noop for Node.js,
# but the V8 code still tried to acess the code this generates.
# Refs: https://github.com/nodejs/node/blob/169b7f1f3b3751289f24678930e6a5731464ebc9/deps/v8/src/bootstrapper.cc#L5172-L5174
],
}, {
'toolsets': ['target'],
'dependencies': [
'mksnapshot',
'js2c_extras',
],
}],
['component=="shared_library"', {
Expand Down Expand Up @@ -538,10 +543,10 @@
'conditions': [
['want_separate_host_toolset==1', {
'toolsets': ['host', 'target'],
'dependencies': ['js2c#host'],
'dependencies': [ 'js2c_extras#host', ],
}, {
'toolsets': ['target'],
'dependencies': ['js2c#target'],
'dependencies': [ 'js2c_extras', ],
}],
['component=="shared_library"', {
'defines': [
Expand Down Expand Up @@ -2508,7 +2513,7 @@
},
}, # v8_libsampler
{
'target_name': 'js2c',
'target_name': 'js2c_extras',
'type': 'none',
'conditions': [
['want_separate_host_toolset==1', {
Expand All @@ -2517,14 +2522,6 @@
'toolsets': ['target'],
}],
],
'variables': {
'library_files': [
'../src/js/macros.py',
'../src/message-template.h',
'../src/js/prologue.js',
],
'libraries_extras_bin_file': '<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin',
},
'actions': [
{
'action_name': 'js2c_extras',
Expand All @@ -2535,14 +2532,12 @@
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc'],
'action': [
'python',
'../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'EXTRAS',
'<@(v8_extra_library_files)',
'../tools/js2c.py', '<@(_outputs)',
'EXTRAS', '<@(v8_extra_library_files)',
],
},
],
}, # js2c
}, # js2c_extras
{
'target_name': 'torque_base',
'type': '<(component)',
Expand Down
8 changes: 4 additions & 4 deletions deps/v8/gypfiles/v8_external_snapshot.gypi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'toolsets': ['host', 'target'],
'dependencies': [
'mksnapshot#host',
'js2c#host',
'js2c_extras#host',
'natives_blob',
]
}, {
Expand Down Expand Up @@ -141,7 +141,7 @@
['v8_use_external_startup_data==1', {
'conditions': [
['want_separate_host_toolset==1', {
'dependencies': ['js2c#host'],
'dependencies': ['js2c_extras#host'],
}],
],
'actions': [
Expand All @@ -151,14 +151,14 @@
'../tools/js2c.py',
'<@(v8_extra_library_files)',
],
'outputs': ['<@(libraries_extras_bin_file)'],
'outputs': ['<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin'],
'action': [
'python',
'../tools/js2c.py',
'<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
'EXTRAS',
'<@(v8_extra_library_files)',
'--startup_blob', '<@(libraries_extras_bin_file)',
'--startup_blob', '<@(_outputs)',
'--nojs',
],
},
Expand Down