diff options
| author | Bert Belder <bertbelder@gmail.com> | 2011-10-29 01:06:09 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2011-10-29 01:06:47 +0200 |
| commit | 2f22024806269e9836f56ef9a55d08991acd8a21 (patch) | |
| tree | c37ca14353cb8f8f14aa01d977600ed88ec07c7b /deps/uv/common.gypi | |
| parent | c0c4bd4efac130500335270f77964a515e70e206 (diff) | |
| download | android-node-v8-2f22024806269e9836f56ef9a55d08991acd8a21.tar.gz android-node-v8-2f22024806269e9836f56ef9a55d08991acd8a21.tar.bz2 android-node-v8-2f22024806269e9836f56ef9a55d08991acd8a21.zip | |
Upgrade libuv to 90e15f1110
Diffstat (limited to 'deps/uv/common.gypi')
| -rw-r--r-- | deps/uv/common.gypi | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/deps/uv/common.gypi b/deps/uv/common.gypi index 373c3aa980..31d6b64288 100644 --- a/deps/uv/common.gypi +++ b/deps/uv/common.gypi @@ -114,9 +114,11 @@ ], }], [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', { - 'cflags': [ '-Wall', '-pthread', ], + 'variables': { + 'gcc_version%': '<!(python build/gcc_version.py)>)', + }, + 'cflags': [ '-Wall' ], 'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ], - 'ldflags': [ '-pthread', ], 'conditions': [ [ 'host_arch != target_arch and target_arch=="ia32"', { 'cflags': [ '-m32' ], @@ -125,7 +127,14 @@ [ 'OS=="linux"', { 'cflags': [ '-ansi' ], }], - [ 'visibility=="hidden"', { + [ 'OS=="solaris"', { + 'cflags': [ '-pthreads' ], + 'ldflags': [ '-pthreads' ], + }, { + 'cflags': [ '-pthread' ], + 'ldflags': [ '-pthread' ], + }], + [ 'visibility=="hidden" and gcc_version >= "4.0.0"', { 'cflags': [ '-fvisibility=hidden' ], }], ], |