From d9ff4562e6df90f376594f0646af20342bff84ea Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Wed, 30 Mar 2016 13:40:48 -0700
Subject: [PATCH] make C# mac build use same args as in artifact builder
---
tools/run_tests/run_tests.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 486173c045..6e20da1dce 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -478,9 +478,8 @@ class CSharpLanguage(object):
_check_compiler(self.args.compiler, ['default'])
if self.platform == 'mac':
# On Mac, official distribution of mono is 32bit.
- # TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build
- self._make_options = ['EMBED_OPENSSL=true'
- 'CFLAGS=-arch i386', 'LDFLAGS=-arch i386']
+ self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true',
+ 'CFLAGS=-m32', 'LDFLAGS=-m32']
else:
self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true']
--
GitLab