diff options
| author | Bradley T. Hughes <bradleythughes@fastmail.fm> | 2016-10-16 13:45:33 +0000 |
|---|---|---|
| committer | Rod Vagg <rod@vagg.org> | 2016-10-18 14:20:10 +1100 |
| commit | a9f4fc905ad65144edb84974c52c9a9b1387ac8b (patch) | |
| tree | 26355bd546bc8a7373954351053d160eb6709622 /deps | |
| parent | d317184f9709bf03674987611b789876323d7b4a (diff) | |
| download | android-node-v8-a9f4fc905ad65144edb84974c52c9a9b1387ac8b.tar.gz android-node-v8-a9f4fc905ad65144edb84974c52c9a9b1387ac8b.tar.bz2 android-node-v8-a9f4fc905ad65144edb84974c52c9a9b1387ac8b.zip | |
build: do not define ZLIB_CONST
This define is not available in zlib prior to version 1.2.5.2. See
https://github.com/nodejs/node/issues/9110 for details. Workaround the
build breakage reported by casting away const in src/inspector_agent.cc
instead.
PR-URL: https://github.com/nodejs/node/pull/9122
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/zlib/zlib.gyp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/deps/zlib/zlib.gyp b/deps/zlib/zlib.gyp index 65133d5fce..cf0b090d9e 100644 --- a/deps/zlib/zlib.gyp +++ b/deps/zlib/zlib.gyp @@ -12,7 +12,6 @@ { 'target_name': 'zlib', 'type': 'static_library', - 'defines': [ 'ZLIB_CONST' ], 'sources': [ 'adler32.c', 'compress.c', @@ -45,7 +44,6 @@ '.', ], 'direct_dependent_settings': { - 'defines': [ 'ZLIB_CONST' ], 'include_dirs': [ '.', ], @@ -74,12 +72,10 @@ 'direct_dependent_settings': { 'defines': [ 'USE_SYSTEM_ZLIB', - 'ZLIB_CONST', ], }, 'defines': [ 'USE_SYSTEM_ZLIB', - 'ZLIB_CONST', ], 'link_settings': { 'libraries': [ |