aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/run_tests/run_tests.py
diff options
context:
space:
mode:
authorGravatar Jan Tattermusch <jtattermusch@google.com>2018-04-20 14:52:53 +0200
committerGravatar Jan Tattermusch <jtattermusch@google.com>2018-04-20 14:52:53 +0200
commitf723164e3ebfd95673d03dc495ca366a2283b32d (patch)
tree44761468d8b270fabb0b44e28a211bc4202848b5 /tools/run_tests/run_tests.py
parent85570890f86f7bb011fbc6934f113bd47e99a0d9 (diff)
new mono versions on MacOS default to 64bit runtime
Diffstat (limited to 'tools/run_tests/run_tests.py')
-rwxr-xr-xtools/run_tests/run_tests.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 4146eec42d..6fb0f89381 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -921,9 +921,6 @@ class CSharpLanguage(object):
if self.platform == 'mac':
# TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build
self._make_options = ['EMBED_OPENSSL=true']
- if self.args.compiler != 'coreclr':
- # On Mac, official distribution of mono is 32bit.
- self._make_options += ['ARCH_FLAGS=-m32', 'LDFLAGS=-m32']
else:
self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true']
@@ -944,6 +941,9 @@ class CSharpLanguage(object):
assembly_subdir += '/net45'
if self.platform == 'windows':
runtime_cmd = []
+ elif self.platform == 'mac':
+ # mono before version 5.2 on MacOS defaults to 32bit runtime
+ runtime_cmd = ['mono', '--arch=64']
else:
runtime_cmd = ['mono']