Skip to content

Commit

Permalink
build: intl: avoid 'duplicate main()' on ICU 56
Browse files Browse the repository at this point in the history
* 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 <info@bnoordhuis.nl>
PR-URL: #3066
Fixes: #3065
  • Loading branch information
srl295 authored and jasnell committed Oct 8, 2015
1 parent 725c727 commit f00f326
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 f00f326

Please sign in to comment.