From 76fe9309b9f532d21d889b06f722d57e0139e9d0 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Thu, 19 Sep 2013 21:11:08 +0000 Subject: [PATCH] Use link_settings instead of all_dependent_settings to pacify xcode gyp generator Should unbreak e.g. http://chromegw/i/chromium.webrtc.fyi/builders/Mac%20%5Blatest%20WebRTC%20trunk%5D/builds/2396 R=niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2261004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4796 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/libjingle.gyp | 6 +----- .../modules/audio_coding/codecs/isac/main/source/isac.gypi | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 2caa75692..5250eec1b 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -221,11 +221,6 @@ '<(DEPTH)/talk/app/webrtc/objc/public', ], }, - 'all_dependent_settings': { - 'libraries': [ - '-lstdc++', - ], - }, 'include_dirs': [ '<(DEPTH)/talk/app/webrtc', '<(DEPTH)/talk/app/webrtc/objc', @@ -234,6 +229,7 @@ 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', + '-lstdc++', ], }, 'xcode_settings': { diff --git a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi b/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi index 7825f0952..3d4859832 100644 --- a/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi +++ b/webrtc/modules/audio_coding/codecs/isac/main/source/isac.gypi @@ -78,7 +78,7 @@ 'defines': [ 'WEBRTC_LINUX', ], - 'all_dependent_settings': { + 'link_settings': { 'libraries': [ '-lm', ],