From 1fa0cb83e323db6d077e0e9970f3776eb5805140 Mon Sep 17 00:00:00 2001 From: Stewart Addison Date: Fri, 28 Aug 2015 18:05:57 +0100 Subject: [PATCH] build: fix icutrim when building small-icu on BE Fix a build error that occurs when icutrim is run to cut down the ICU locale set on Big-Endian platforms when building with --with-intl=small-icu (which is done by the "make binary" target). This fixes the binary build on POWER platforms. Fixes: https://github.com/nodejs/node/issues/2601 PR-URL: https://github.com/nodejs/node/pull/2602 Reviewed-By: Steven Loomis --- tools/icu/icu-generic.gyp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp index 900cdb96f0a799..4741b337ea6b0a 100644 --- a/tools/icu/icu-generic.gyp +++ b/tools/icu/icu-generic.gyp @@ -29,9 +29,17 @@ 'type': 'none', 'toolsets': [ 'host', 'target' ], 'direct_dependent_settings': { + 'conditions': [ + [ 'icu_endianness == "l"', { + 'defines': [ + # ICU cannot swap the initial data without this. + # http://bugs.icu-project.org/trac/ticket/11046 + 'UCONFIG_NO_LEGACY_CONVERSION=1', + 'UCONFIG_NO_IDNA=1', + ], + }], + ], 'defines': [ - 'UCONFIG_NO_LEGACY_CONVERSION=1', - 'UCONFIG_NO_IDNA=1', 'UCONFIG_NO_TRANSLITERATION=1', 'UCONFIG_NO_SERVICE=1', 'UCONFIG_NO_REGULAR_EXPRESSIONS=1',