commit 63b0d11ca81b348dcf4463ff935ef326b4be7358
author Ken Payson <kpayson@google.com> Mon Apr 17 00:03:40 2017 -0700
committer Ken Payson <kpayson@google.com> Mon Apr 17 00:03:40 2017 -0700
tree e2d31750f53f1bf07bbaf1e33cbf1e45e606ae18
parent ae5ca1b44770dd8cb0df74e91915e71116fa75ab

Final changes

setup.py

diff --git a/setup.py b/setup.py
index 65c0a94..4cbd1a4 100644
--- a/setup.py
+++ b/setup.py
@@ -104,6 +104,7 @@
 if EXTRA_ENV_COMPILE_ARGS is None:
   EXTRA_ENV_COMPILE_ARGS = ''
   if 'win32' in sys.platform and sys.version_info < (3, 5):
+    EXTRA_ENV_COMPILE_ARGS += ' -std=c++11'
     # We use define flags here and don't directly add to DEFINE_MACROS below to
     # ensure that the expert user/builder has a way of turning it off (via the
     # envvars) without adding yet more GRPC-specific envvars.
@@ -113,7 +114,7 @@
     else:
       EXTRA_ENV_COMPILE_ARGS += ' -D_ftime=_ftime64 -D_timeb=__timeb64'
   elif 'win32' in sys.platform:
-    EXTRA_ENV_COMPILE_ARGS += ' -D_PYTHON_MSVC -std=c++11'
+    EXTRA_ENV_COMPILE_ARGS += ' -D_PYTHON_MSVC'
   elif "linux" in sys.platform:
     EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -fvisibility=hidden -fno-wrapv'
   elif "darwin" in sys.platform: