Skip to content
Snippets Groups Projects
Commit 6d082203 authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

try making C# tests work on coreclr on mac

parent 381e26a2
No related branches found
No related tags found
No related merge requests found
...@@ -509,10 +509,11 @@ class CSharpLanguage(object): ...@@ -509,10 +509,11 @@ class CSharpLanguage(object):
self._docker_distro = 'coreclr' self._docker_distro = 'coreclr'
if self.platform == 'mac': if self.platform == 'mac':
# On Mac, official distribution of mono is 32bit.
# TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build # TODO(jtattermusch): EMBED_ZLIB=true currently breaks the mac build
self._make_options = ['EMBED_OPENSSL=true', self._make_options = ['EMBED_OPENSSL=true']
'CFLAGS=-m32', 'LDFLAGS=-m32'] if self.args.compiler != 'coreclr':
# On Mac, official distribution of mono is 32bit.
self._make_options += ['CFLAGS=-m32', 'LDFLAGS=-m32']
else: else:
self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true'] self._make_options = ['EMBED_OPENSSL=true', 'EMBED_ZLIB=true']
...@@ -529,6 +530,9 @@ class CSharpLanguage(object): ...@@ -529,6 +530,9 @@ class CSharpLanguage(object):
if self.platform == 'linux': if self.platform == 'linux':
assembly_subdir += '/netstandard1.5/debian.8-x64' assembly_subdir += '/netstandard1.5/debian.8-x64'
assembly_extension = '' assembly_extension = ''
if self.platform == 'mac':
assembly_subdir += '/netstandard1.5/osx.10.11-x64'
assembly_extension = ''
else: else:
assembly_subdir += '/netstandard1.5/win7-x64' assembly_subdir += '/netstandard1.5/win7-x64'
runtime_cmd = [] runtime_cmd = []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment