luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: use link_settings, fix typo

Browse Source 
* Use link_settings instead of direct_dependent_settings.
* Fix typo: s/ldlags/ldflags/

Pointed out by a certain R.L. Dahl of San Francisco, CA.

Fixes #618.
This commit is contained in:
Ben Noordhuis 2012-11-09 20:20:50 +01:00
parent f372fd4b13
commit deeec421af
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
uv.gyp
View File

@ -10,11 +10,9 @@
],
'conditions': [
['OS=="solaris"', {
'cflags': ['-pthreads'],
'ldlags': ['-pthreads'],
'cflags': [ '-pthreads' ],
}, {
'cflags': ['-pthread'],
'ldlags': ['-pthread'],
'cflags': [ '-pthread' ],
}],
],
}],
@ -32,13 +30,7 @@
],
'direct_dependent_settings': {
'include_dirs': [ 'include' ],
'conditions': [
['OS=="linux"', {
'libraries': [ '-ldl' ],
}],
],
},
'defines': [
'HAVE_CONFIG_H'
],
@ -214,12 +206,21 @@
'src/unix/uv-eio.h',
],
'include_dirs': [ 'src/unix/ev', ],
'libraries': [ '-lm' ]
'link_settings': {
'libraries': [ '-lm' ],
'conditions': [
['OS=="solaris"', {
'ldflags': [ '-pthreads' ],
}, {
'ldflags': [ '-pthread' ],
}],
],
},
}],
[ 'OS=="mac"', {
'include_dirs': [ 'src/ares/config_darwin' ],
'sources': [ 'src/unix/darwin.c' ],
'direct_dependent_settings': {
'link_settings': {
'libraries': [
'$(SDKROOT)/System/Library/Frameworks/CoreServices.framework',
],
@ -242,8 +243,8 @@
'EV_CONFIG_H="config_linux.h"',
'EIO_CONFIG_H="config_linux.h"',
],
'direct_dependent_settings': {
'libraries': [ '-lrt' ],
'link_settings': {
'libraries': [ '-ldl', '-lrt' ],
},
}],
[ 'OS=="solaris"', {
@ -255,7 +256,7 @@
'EV_CONFIG_H="config_sunos.h"',
'EIO_CONFIG_H="config_sunos.h"',
],
'direct_dependent_settings': {
'link_settings': {
'libraries': [
'-lkstat',
'-lsocket',
@ -270,7 +271,7 @@
'EV_CONFIG_H="config_freebsd.h"',
'EIO_CONFIG_H="config_freebsd.h"',
],
'direct_dependent_settings': {
'link_settings': {
'libraries': [
'-lkvm',
],