Skip to content

Commit 3191e2c

Browse files
joyeecheungtargos
authored andcommitted
build: use ICU_UTIL_DATA_STATIC across V8
ICU_UTIL_DATA_SHARED had been removed since https://crrev.com/c/1513615, but Node.js still defined it and relied on the removed path on Windows, so the ICU initialization in mksnapshot had been silently failing since then. https://crrev.com/c/7679153 made the failure visible so the build started breaking on Windows. Fix it by always using ICU_UTIL_DATA_STATIC since we already compile the ICU data statically in. Signed-off-by: Joyee Cheung <joyeec9h3@gmail.com>
1 parent 45f61bf commit 3191e2c

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

tools/v8_gypfiles/v8.gyp

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1350,13 +1350,7 @@
13501350
['icu_use_data_file_flag', {
13511351
'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'],
13521352
}, {
1353-
'conditions': [
1354-
['OS=="win"', {
1355-
'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'],
1356-
}, {
1357-
'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'],
1358-
}],
1359-
],
1353+
'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'],
13601354
}],
13611355
['OS=="win"', {
13621356
'dependencies': [

0 commit comments

Comments
 (0)