diff options
| author | cjihrig <cjihrig@gmail.com> | 2016-10-24 22:13:07 -0400 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2016-10-26 09:42:41 -0400 |
| commit | 63243bcb330408d511b3945c53719425d8b7abb8 (patch) | |
| tree | f24252040adcc8c1a1dda22965fec39ac8df72de /deps/uv/common.gypi | |
| parent | 2d472a36c1d5e565fe375185f273402f84bed528 (diff) | |
| download | android-node-v8-63243bcb330408d511b3945c53719425d8b7abb8.tar.gz android-node-v8-63243bcb330408d511b3945c53719425d8b7abb8.tar.bz2 android-node-v8-63243bcb330408d511b3945c53719425d8b7abb8.zip | |
deps: upgrade libuv to 1.10.0
Fixes: https://github.com/nodejs/node/issues/4351
Fixes: https://github.com/nodejs/node/issues/6763
Refs: https://github.com/nodejs/node/pull/8280
PR-URL: https://github.com/nodejs/node/pull/9267
Reviewed-By: Santiago Gimeno <santiago.gimeno@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps/uv/common.gypi')
| -rw-r--r-- | deps/uv/common.gypi | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/deps/uv/common.gypi b/deps/uv/common.gypi index 56bca2948d..44db701d68 100644 --- a/deps/uv/common.gypi +++ b/deps/uv/common.gypi @@ -11,7 +11,7 @@ 'configurations': { 'Debug': { 'defines': [ 'DEBUG', '_DEBUG' ], - 'cflags': [ '-g', '-O0', '-fwrapv' ], + 'cflags': [ '-g' ], 'msvs_settings': { 'VCCLCompilerTool': { 'target_conditions': [ @@ -35,6 +35,9 @@ 'OTHER_CFLAGS': [ '-Wno-strict-aliasing' ], }, 'conditions': [ + ['OS != "zos"', { + 'cflags': [ '-O0', '-fwrapv' ] + }], ['OS == "android"', { 'cflags': [ '-fPIE' ], 'ldflags': [ '-fPIE', '-pie' ] @@ -151,7 +154,7 @@ 'cflags': [ '-pthreads' ], 'ldflags': [ '-pthreads' ], }], - [ 'OS not in "solaris android"', { + [ 'OS not in "solaris android zos"', { 'cflags': [ '-pthread' ], 'ldflags': [ '-pthread' ], }], |