commit 6ffdb9494b0b52248afda4b8dc8b34759ee2358a
author murgatroid99 <mlumish@google.com> Thu Oct 22 16:10:05 2015 -0700
committer murgatroid99 <mlumish@google.com> Thu Oct 22 16:10:05 2015 -0700
tree b133d98cd2795f6f727f23488a61c7d605835bb4
parent 403caaf4fb8273121c3f6896815ca3e6b9ae6aef

Modified Mac build fix for new binding.gyp structure

binding.gyp

diff --git a/binding.gyp b/binding.gyp
index 4c6a641..9b1dc7a 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -73,16 +73,6 @@
          ]
         ]
       }],
-      ['OS=="mac"', {
-        'xcode_settings': {
-          'MACOSX_DEPLOYMENT_TARGET': '10.9',
-          'OTHER_CFLAGS': [
-            '-fno-strict-aliasing',
-            '-std=c++11',
-            '-stdlib=libc++'
-          ]
-        }
-      }]
     ]
   },
   'targets': [
@@ -134,6 +124,16 @@
         'src/core/support/time_win32.c',
         'src/core/support/tls_pthread.c',
       ],
+      "conditions": [
+        ['OS == "mac"', {
+          'xcode_settings': {
+            'MACOSX_DEPLOYMENT_TARGET': '10.9',
+            'OTHER_CFLAGS': [
+              '-stdlib=libc++'
+            ]
+          }
+        }]
+      ],
     },
     {
       'target_name': 'grpc',
@@ -292,6 +292,16 @@
         'src/core/census/operation.c',
         'src/core/census/tracing.c',
       ],
+      "conditions": [
+        ['OS == "mac"', {
+          'xcode_settings': {
+            'MACOSX_DEPLOYMENT_TARGET': '10.9',
+            'OTHER_CFLAGS': [
+              '-stdlib=libc++'
+            ]
+          }
+        }]
+      ],
     },
     {
       'include_dirs': [