From deeec421afed1fa44961204d2e0a17134f3ea02a Mon Sep 17 00:00:00 2001
From: Ben Noordhuis <info@bnoordhuis.nl>
Date: Fri, 9 Nov 2012 20:20:50 +0100
Subject: [PATCH] build: use link_settings, fix typo

* 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.
---
 uv.gyp | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/uv.gyp b/uv.gyp
index 96c6b724c..f288d92d3 100644
--- a/uv.gyp
+++ b/uv.gyp
@@ -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',
             ],