Reviewers: mcilroy, vogelheim,
Message:
Please take a look.
Description:
Properly separate host and target builds when using external natives.
Please review this at https://codereview.chromium.org/506983002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+11, -8 lines):
M tools/gyp/v8.gyp
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index
3b832852e3b40f2a6f2dbdd2af6f5519d50d2293..9b49968d97575462a56dd20c605147852e81b8cd
100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -55,12 +55,9 @@
# to appear before libv8_snapshot.a so it's listed explicitly.
'dependencies': ['v8_base', 'v8_nosnapshot'],
}],
- ['v8_use_external_startup_data==1 and
want_separate_host_toolset==0', {
+ ['v8_use_external_startup_data==1', {
'dependencies': ['v8_base', 'v8_external_snapshot'],
}],
- ['v8_use_external_startup_data==1 and
want_separate_host_toolset==1', {
- 'dependencies': ['v8_base', 'v8_external_snapshot#host'],
- }],
['component=="shared_library"', {
'type': '<(component)',
'sources': [
@@ -218,11 +215,11 @@
'type': 'static_library',
'conditions': [
['want_separate_host_toolset==1', {
- 'toolsets': ['host'],
+ 'toolsets': ['host', 'target'],
'dependencies': [
'mksnapshot#host',
'js2c#host',
- 'natives_blob#host',
+ 'natives_blob',
]}, {
'toolsets': ['target'],
'dependencies': [
@@ -1344,7 +1341,13 @@
'type': 'none',
'conditions': [
[ 'v8_use_external_startup_data==1', {
- 'dependencies': ['js2c'],
+ 'conditions': [
+ ['want_separate_host_toolset==1', {
+ 'dependencies': ['js2c#host'],
+ }, {
+ 'dependencies': ['js2c'],
+ }],
+ ],
'actions': [{
'action_name': 'concatenate_natives_blob',
'inputs': [
@@ -1359,7 +1362,7 @@
}],
}],
['want_separate_host_toolset==1', {
- 'toolsets': ['host'],
+ 'toolsets': ['host', 'target'],
}, {
'toolsets': ['target'],
}],
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
