diff options
author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-05 20:44:25 +0100 |
---|---|---|
committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-05 22:25:20 +0100 |
commit | eaed2a11ecf8d4f8a309f42d6bbc72306c01b755 (patch) | |
tree | 59abc7b7d4c1396c5bd60a47f13e694076b5b299 /deps/uv/uv.gyp | |
parent | 94e147500c5bf457c9101bda8c8020d8ff896708 (diff) | |
download | android-node-v8-eaed2a11ecf8d4f8a309f42d6bbc72306c01b755.tar.gz android-node-v8-eaed2a11ecf8d4f8a309f42d6bbc72306c01b755.tar.bz2 android-node-v8-eaed2a11ecf8d4f8a309f42d6bbc72306c01b755.zip |
deps: update libuv to 1.2.0
PR-URL: https://github.com/iojs/io.js/pull/237
Reviewed-By: Bert Belder <bertbelder@gmail.com>
Reviewed-By: Saúl Ibarra Corretgé <saghul@gmail.com>
Diffstat (limited to 'deps/uv/uv.gyp')
-rw-r--r-- | deps/uv/uv.gyp | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/deps/uv/uv.gyp b/deps/uv/uv.gyp index a5ba14c315..45af6a1f96 100644 --- a/deps/uv/uv.gyp +++ b/deps/uv/uv.gyp @@ -17,28 +17,8 @@ }], ], 'xcode_settings': { - 'conditions': [ - [ 'clang==1', { - 'WARNING_CFLAGS': [ - '-Wall', - '-Wextra', - '-Wno-unused-parameter', - '-Wno-dollar-in-identifier-extension' - ]}, { - 'WARNING_CFLAGS': [ - '-Wall', - '-Wextra', - '-Wno-unused-parameter' - ]} - ] - ], - 'OTHER_LDFLAGS': [ - ], - 'OTHER_CFLAGS': [ - '-g', - '--std=gnu89', - '-pedantic' - ], + 'WARNING_CFLAGS': [ '-Wall', '-Wextra', '-Wno-unused-parameter' ], + 'OTHER_CFLAGS': [ '-g', '--std=gnu89', '-pedantic' ], } }, @@ -335,6 +315,7 @@ 'test/test-loop-close.c', 'test/test-loop-stop.c', 'test/test-loop-time.c', + 'test/test-loop-configure.c', 'test/test-walk-handles.c', 'test/test-watcher-cross-stop.c', 'test/test-multiple-listen.c', @@ -350,6 +331,7 @@ 'test/test-platform-output.c', 'test/test-poll.c', 'test/test-poll-close.c', + 'test/test-poll-close-doesnt-corrupt-stack.c', 'test/test-poll-closesocket.c', 'test/test-process-title.c', 'test/test-ref.c', |