From aa97ae7cf80b121aa5c4a65a228a16d71cf68931 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 25 Sep 2015 14:33:25 -0400 Subject: 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 PR-URL: https://github.com/nodejs/node/pull/3066 Fixes: https://github.com/nodejs/node/issues/3065 --- tools/icu/icu-generic.gyp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tools/icu') 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': [ -- cgit v1.2.3