summaryrefslogtreecommitdiff
path: root/tools/icu
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2016-10-01 00:20:16 +0200
committerFranziska Hinkelmann <franzih@chromium.org>2016-10-03 12:53:24 +0200
commitc1be60945a0fa829b546ec162f6f7e8ece83e3ba (patch)
tree9a5e21628b1f6d7b0481b45fda7f14ce77fd7f4f /tools/icu
parent4c619ec421fc5080888bb68d21146da6d3219b21 (diff)
downloadandroid-node-v8-c1be60945a0fa829b546ec162f6f7e8ece83e3ba.tar.gz
android-node-v8-c1be60945a0fa829b546ec162f6f7e8ece83e3ba.tar.bz2
android-node-v8-c1be60945a0fa829b546ec162f6f7e8ece83e3ba.zip
build: don't build icu with -fno-rtti
ICU should be compiled with -frtti (and it sets that flag in its gyp file) but it was also inheriting the -fno-rtti flag from common.gypi, breaking the build on some systems. Fixes: https://github.com/nodejs/node/issues/8867 PR-URL: https://github.com/nodejs/node/pull/8886 Reviewed-By: Johan Bergström <bugs@bergstroem.nu> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com>
Diffstat (limited to 'tools/icu')
-rw-r--r--tools/icu/icu-generic.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/icu/icu-generic.gyp b/tools/icu/icu-generic.gyp
index ecbf6d18c2..3a284461d8 100644
--- a/tools/icu/icu-generic.gyp
+++ b/tools/icu/icu-generic.gyp
@@ -67,6 +67,7 @@
[ 'os_posix == 1 and OS != "mac" and OS != "ios"', {
'cflags': [ '-Wno-deprecated-declarations' ],
'cflags_cc': [ '-frtti' ],
+ 'cflags_cc!': [ '-fno-rtti' ],
}],
[ 'OS == "mac" or OS == "ios"', {
'xcode_settings': {'GCC_ENABLE_CPP_RTTI': 'YES' },