diff options
| author | Steven R. Loomis <srl@icu-project.org> | 2015-09-25 14:33:25 -0400 |
|---|---|---|
| committer | Steven R. Loomis <srl@icu-project.org> | 2015-10-06 14:34:12 -0400 |
| commit | aa97ae7cf80b121aa5c4a65a228a16d71cf68931 (patch) | |
| tree | a24929df84103b3706edc71c9822654f95b51308 /tools/icu | |
| parent | d25e34ba690f2a25af033c25d4f120b25cb014ac (diff) | |
| download | android-node-v8-aa97ae7cf80b121aa5c4a65a228a16d71cf68931.tar.gz android-node-v8-aa97ae7cf80b121aa5c4a65a228a16d71cf68931.tar.bz2 android-node-v8-aa97ae7cf80b121aa5c4a65a228a16d71cf68931.zip | |
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 <info@bnoordhuis.nl>
PR-URL: https://github.com/nodejs/node/pull/3066
Fixes: https://github.com/nodejs/node/issues/3065
Diffstat (limited to 'tools/icu')
| -rw-r--r-- | tools/icu/icu-generic.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp index d6c3f64216..222a9e9566 100644 --- a/tools/icu/icu-generic.gyp +++ b/tools/icu/icu-generic.gyp @@ -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': [ |