aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar kpayson64 <kpayson@google.com>2017-05-10 10:25:28 -0700
committerGravatar GitHub <noreply@github.com>2017-05-10 10:25:28 -0700
commit449bf017e1d19571b5349911b85802f3039dd7a5 (patch)
treecd7c5defc662f3ab48425805d1ee1da2f9c2dfe3
parent0cab13f55837bd9c8fdc97115af765055b9a2aa8 (diff)
parentb91c5fb8ba84b193a0b2e586e4dca05978ffad32 (diff)
Merge pull request #11048 from kpayson64/fix_py_artifact
Fix python artifact build
-rw-r--r--setup.py2
-rw-r--r--src/python/grpcio/commands.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/setup.py b/setup.py
index a89511487f..cb852735f0 100644
--- a/setup.py
+++ b/setup.py
@@ -116,7 +116,7 @@ if EXTRA_ENV_COMPILE_ARGS is None:
elif 'win32' in sys.platform:
EXTRA_ENV_COMPILE_ARGS += ' -D_PYTHON_MSVC'
elif "linux" in sys.platform:
- EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -fvisibility=hidden -fno-wrapv'
+ EXTRA_ENV_COMPILE_ARGS += ' -std=c++11 -std=gnu99 -fvisibility=hidden -fno-wrapv'
elif "darwin" in sys.platform:
EXTRA_ENV_COMPILE_ARGS += ' -fvisibility=hidden -fno-wrapv'
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
index 4f072809c4..f4ccb1ab94 100644
--- a/src/python/grpcio/commands.py
+++ b/src/python/grpcio/commands.py
@@ -284,9 +284,9 @@ class BuildExt(build_ext.build_ext):
stderr=subprocess.PIPE)
make_out, make_err = make_process.communicate()
if make_out and make_process.returncode != 0:
- sys.stdout.write(make_out + '\n')
+ sys.stdout.write(str(make_out) + '\n')
if make_err:
- sys.stderr.write(make_err + '\n')
+ sys.stderr.write(str(make_err) + '\n')
if make_process.returncode != 0:
raise Exception("make command failed!")