diff options
| author | Stewart Addison <sxa@uk.ibm.com> | 2015-08-28 18:05:57 +0100 |
|---|---|---|
| committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2015-09-17 10:53:54 -0400 |
| commit | 1fa0cb83e323db6d077e0e9970f3776eb5805140 (patch) | |
| tree | 2a4d0b58593268e84a316b876cdd6ddd8e3f7c7a /tools/icu | |
| parent | 2853f9894fcecef5979d7ec2618c79760532253c (diff) | |
| download | node-new-1fa0cb83e323db6d077e0e9970f3776eb5805140.tar.gz | |
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 <srloomis@us.ibm.com>
Diffstat (limited to 'tools/icu')
| -rw-r--r-- | tools/icu/icu-generic.gyp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp index 900cdb96f0..4741b337ea 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', |