From 2a322c28150e26649e84eac235aa9c652263de1e Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 30 Mar 2016 13:55:07 -0700
Subject: [PATCH] dont break mac build by EMBED_ZLIB=true again
---
tools/run_tests/run_tests.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 6e20da1dce..71bb7b12db 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -478,7 +478,8 @@ class CSharpLanguage(object):
_check_compiler(self.args.compiler, ['default'])
if self.platform == 'mac':
# On Mac, official distribution of mono is 32bit.
- self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true',
+ # TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build
+ self._make_options = ['EMBED_OPENSSL=true',
'CFLAGS=-m32', 'LDFLAGS=-m32']
else:
self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true']
--
GitLab