From 1135ad0c38b2a762f66ba98bb9252e20affa6bfc Mon Sep 17 00:00:00 2001 From: Stewart Addison Date: Fri, 28 Aug 2015 18:05:57 +0100 Subject: [PATCH] Fix icutrim when building small-icu on Big-Endian platforms --- 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..9631eda2ac2e53 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',