Skip to content

Commit aa97ae7

Browse files
committedOct 6, 2015
build: intl: avoid 'duplicate main()' on ICU 56
* Exclude `derb.cpp` as well as `derb.c` from Node builds (file was renamed in ICU 56) ICU 56 renamed derb.c to derb.cpp because of C++ yay. This broke the exclusion of "derb.c" when building tools. Solution is to add derb.c AND derb.cpp to exclusion. We don't build the 'derb' tool, so it's fine to list the excluded source twice. Reviewed-By: Ben Noordhuis <[email protected]> PR-URL: #3066 Fixes: #3065
1 parent d25e34b commit aa97ae7

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed
 

‎tools/icu/icu-generic.gyp

+4-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77

88
{
99
'variables': {
10-
'icu_src_derb': [ '../../deps/icu/source/tools/genrb/derb.c' ],
10+
'icu_src_derb': [
11+
'../../deps/icu/source/tools/genrb/derb.c',
12+
'../../deps/icu/source/tools/genrb/derb.cpp'
13+
],
1114
},
1215
'includes': [ '../../icu_config.gypi' ],
1316
'targets': [

0 commit comments

Comments
 (0)
Please sign in to comment.