Reviewers: Jakob,
Description:
Only depend on icudata on windows.
On windows, this triggers the dll to be copied to the correct
locations. On other platforms, icudata is compiled in, and depending on
it results in an invalid linker archive ordering.
BUG=v8:2745
[email protected]
Please review this at https://codereview.chromium.org/18734003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M samples/samples.gyp
M src/d8.gyp
M tools/gyp/v8.gyp
Index: samples/samples.gyp
diff --git a/samples/samples.gyp b/samples/samples.gyp
index
6af37fcc284be18658dcfaccf1ae94c528087dcd..be7b9ea696c378a8e5b104422fdb080104841b97
100644
--- a/samples/samples.gyp
+++ b/samples/samples.gyp
@@ -42,7 +42,13 @@
'conditions': [
['v8_enable_i18n_support==1', {
'dependencies': [
- '<(DEPTH)/third_party/icu/icu.gyp:*',
+ '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ ],
+ }],
+ ['OS=="win" and v8_enable_i18n_support==1', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/icu/icu.gyp:icudata',
],
}],
],
Index: src/d8.gyp
diff --git a/src/d8.gyp b/src/d8.gyp
index
85c9d53e69901d2483ac06b644ed6c462d83b2e1..15d342dece7699237eb88385a8d28fd4353308b3
100644
--- a/src/d8.gyp
+++ b/src/d8.gyp
@@ -81,7 +81,13 @@
}],
['v8_enable_i18n_support==1', {
'dependencies': [
- '<(DEPTH)/third_party/icu/icu.gyp:*',
+ '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+ ],
+ }],
+ ['OS=="win" and v8_enable_i18n_support==1', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/icu/icu.gyp:icudata',
],
}],
],
Index: tools/gyp/v8.gyp
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp
index
1cd3407ab44c18e6c1248ca47397397ef7f404a3..36b96d5c0d385cd957b77e7b6aea1ae0f6559f0f
100644
--- a/tools/gyp/v8.gyp
+++ b/tools/gyp/v8.gyp
@@ -833,9 +833,15 @@
'../../src/extensions/i18n/number-format.h',
],
'dependencies': [
- '<(DEPTH)/third_party/icu/icu.gyp:*',
+ '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
+ '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
]
}],
+ ['OS=="win" and v8_enable_i18n_support==1', {
+ 'dependencies': [
+ '<(DEPTH)/third_party/icu/icu.gyp:icudata',
+ ],
+ }],
],
},
{
--
--
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/groups/opt_out.
