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',
             ],