Revision: 15619
Author: [email protected]
Date: Thu Jul 11 04:01:00 2013
Log: 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]
Review URL: https://codereview.chromium.org/18734003
http://code.google.com/p/v8/source/detail?r=15619
Modified:
/branches/bleeding_edge/samples/samples.gyp
/branches/bleeding_edge/src/d8.gyp
/branches/bleeding_edge/tools/gyp/v8.gyp
=======================================
--- /branches/bleeding_edge/samples/samples.gyp Thu Jul 11 02:58:54 2013
+++ /branches/bleeding_edge/samples/samples.gyp Thu Jul 11 04:01:00 2013
@@ -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',
],
}],
],
=======================================
--- /branches/bleeding_edge/src/d8.gyp Thu Jul 11 02:58:54 2013
+++ /branches/bleeding_edge/src/d8.gyp Thu Jul 11 04:01:00 2013
@@ -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',
],
}],
],
=======================================
--- /branches/bleeding_edge/tools/gyp/v8.gyp Thu Jul 11 02:58:54 2013
+++ /branches/bleeding_edge/tools/gyp/v8.gyp Thu Jul 11 04:01:00 2013
@@ -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.
