diff options
| author | cjihrig <cjihrig@gmail.com> | 2017-07-06 19:12:45 -0400 |
|---|---|---|
| committer | cjihrig <cjihrig@gmail.com> | 2017-07-13 11:25:10 -0400 |
| commit | 462b2466b34724ce194b4249a3e241083eb753d3 (patch) | |
| tree | 4b80e9f2431ae14a0c01e4621e7cb14c19256466 /deps/uv/common.gypi | |
| parent | 31417b68822abeced64eeb120f064d37bc133f7c (diff) | |
| download | android-node-v8-462b2466b34724ce194b4249a3e241083eb753d3.tar.gz android-node-v8-462b2466b34724ce194b4249a3e241083eb753d3.tar.bz2 android-node-v8-462b2466b34724ce194b4249a3e241083eb753d3.zip | |
deps: upgrade libuv to 1.13.1
PR-URL: https://github.com/nodejs/node/pull/14117
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'deps/uv/common.gypi')
| -rw-r--r-- | deps/uv/common.gypi | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/deps/uv/common.gypi b/deps/uv/common.gypi index 94e7600303..ec482340c2 100644 --- a/deps/uv/common.gypi +++ b/deps/uv/common.gypi @@ -49,9 +49,6 @@ 'cflags': [ '-O3', '-fstrict-aliasing', - '-fomit-frame-pointer', - '-fdata-sections', - '-ffunction-sections', ], 'msvs_settings': { 'VCCLCompilerTool': { @@ -82,6 +79,15 @@ 'LinkIncremental': 1, # disable incremental linking }, }, + 'conditions': [ + ['OS != "os390"', { + 'cflags': [ + '-fomit-frame-pointer', + '-fdata-sections', + '-ffunction-sections', + ], + }], + ] } }, 'msvs_settings': { |