summaryrefslogtreecommitdiff
path: root/deps/cares/cares.gyp
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-07-06 22:18:39 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2013-07-06 22:20:29 +0200
commit58e4edaf6855025099d400ccc1ac23291b109a41 (patch)
tree01e0998f72368fa01b4a47eaa2b8d6e79c5094c8 /deps/cares/cares.gyp
parent82ff891e226ecadde68d000a12e7eb1fd0a17d13 (diff)
downloadios-node-v8-58e4edaf6855025099d400ccc1ac23291b109a41.tar.gz
ios-node-v8-58e4edaf6855025099d400ccc1ac23291b109a41.tar.bz2
ios-node-v8-58e4edaf6855025099d400ccc1ac23291b109a41.zip
deps: upgrade c-ares to piscisaureus/cares@805d153
This should fix the Android build.
Diffstat (limited to 'deps/cares/cares.gyp')
-rw-r--r--deps/cares/cares.gyp10
1 files changed, 9 insertions, 1 deletions
diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp
index e01cbb2ecf..dfa35a25ef 100644
--- a/deps/cares/cares.gyp
+++ b/deps/cares/cares.gyp
@@ -121,13 +121,17 @@
# Not Windows i.e. POSIX
'cflags': [
'-g',
- '--std=gnu89',
'-pedantic',
'-Wall',
'-Wextra',
'-Wno-unused-parameter'
],
}],
+ [ 'OS not in "win android"', {
+ 'cflags': [
+ '--std=gnu89'
+ ],
+ }],
[ 'OS=="linux"', {
'include_dirs': [ 'config/linux' ],
'sources': [ 'config/linux/ares_config.h' ]
@@ -144,6 +148,10 @@
'include_dirs': [ 'config/openbsd' ],
'sources': [ 'config/openbsd/ares_config.h' ]
}],
+ [ 'OS=="android"', {
+ 'include_dirs': [ 'config/android' ],
+ 'sources': [ 'config/android/ares_config.h' ],
+ }],
[ 'OS=="solaris"', {
'include_dirs': [ 'config/sunos' ],
'sources': [ 'config/sunos/ares_config.h' ],