From a6b59e71821bf001e52fd3811e5ad6fec9de6a64 Mon Sep 17 00:00:00 2001 From: Bruce Forstall Date: Tue, 6 Nov 2018 22:35:12 -0800 Subject: [PATCH] Force using clang5.0 for Ubuntu arm32 builds (dotnet/coreclr#20825) * Force using clang5.0 for Ubuntu arm32 builds * Update for code review feedback to https://github.com/dotnet/corefx/pull/33261 Commit migrated from https://github.com/dotnet/coreclr/commit/b107aaaa591c645978f17c20f547ccd902d4cf71 --- src/coreclr/tests/scripts/run-corefx-tests.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/coreclr/tests/scripts/run-corefx-tests.py b/src/coreclr/tests/scripts/run-corefx-tests.py index ec9aef0..57b21f3 100644 --- a/src/coreclr/tests/scripts/run-corefx-tests.py +++ b/src/coreclr/tests/scripts/run-corefx-tests.py @@ -290,7 +290,14 @@ def main(args): config_args = '-Release /p:OSGroup=%s /p:ArchGroup=%s' % (clr_os, arch) - command = ' '.join(('build.cmd' if Is_windows else './build.sh', config_args)) + build_args = config_args + + if not Is_windows and arch == 'arm' : + # We need to force clang5.0; we are building in a docker container that doesn't have + # clang3.9, which is currently the default used by the native build. + build_args += ' /p:BuildNativeClang=--clang5.0' + + command = ' '.join(('build.cmd' if Is_windows else './build.sh', build_args)) log(command) returncode = 0 if testing else os.system(command) if returncode != 0: -- 2.7.4