From 6e2f88c9fd21a06ad265c494325999c679c53375 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Tue, 21 Jun 2016 10:52:40 -0700
Subject: [PATCH] compile 64bit extension for coreclr on windows
---
tools/run_tests/run_tests.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 3881c075d4..d3819c0884 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -501,8 +501,10 @@ class CSharpLanguage(object):
if self.platform == 'windows':
# Explicitly choosing between x86 and x64 arch doesn't work yet
_check_arch(self.args.arch, ['default'])
+ # CoreCLR use 64bit runtime by default.
+ arch_option = 'x64' if self.args.compiler == 'coreclr' else self.args.arch
self._make_options = [_windows_toolset_option(self.args.compiler),
- _windows_arch_option(self.args.arch)]
+ _windows_arch_option(arch_option)]
else:
_check_compiler(self.args.compiler, ['default', 'coreclr'])
if self.platform == 'linux' and self.args.compiler == 'coreclr':
--
GitLab