diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2016-03-30 13:55:07 -0700 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2016-03-30 13:55:07 -0700 |
| commit | 2a322c28150e26649e84eac235aa9c652263de1e (patch) | |
| tree | a90b847ab9dba7062bfb7e4a4ba197f21005d84c /tools | |
| parent | d9ff4562e6df90f376594f0646af20342bff84ea (diff) | |
dont break mac build by EMBED_ZLIB=true again
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run_tests/run_tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
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'] |