From 4e86f2d0dec7046788ed86ba6661364c831c0c8a Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Fri, 25 Sep 2015 14:33:25 -0400 Subject: [PATCH] build: Intl: avoid 'duplicate main()' on 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: PR-URL: Fixes: https://github.com/nodejs/node/issues/3065 --- tools/icu/icu-generic.gyp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp index 4741b337ea6b0a..2af650d382f21d 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': [