Skip to content

Commit

Permalink
build: Intl: avoid 'duplicate main()' on ICU 56
Browse files Browse the repository at this point in the history
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:
PR-URL:
Fixes: nodejs/node#3065
  • Loading branch information
srl295 committed Sep 25, 2015
1 parent 6192c98 commit 4e86f2d
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tools/icu/icu-generic.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@

{
'variables': {
'icu_src_derb': [ '../../deps/icu/source/tools/genrb/derb.c' ],
'icu_src_derb': [
'../../deps/icu/source/tools/genrb/derb.c',
'../../deps/icu/source/tools/genrb/derb.cpp'
],
},
'includes': [ '../../icu_config.gypi' ],
'targets': [
Expand Down

0 comments on commit 4e86f2d

Please sign in to comment.