diff options
| author |  Jan Tattermusch <jtattermusch@google.com> | 2018-10-04 11:17:29 +0200 |
|---|---|---|
| committer | Jan Tattermusch <jtattermusch@google.com> | 2018-10-04 11:21:36 +0200 |
| commit | 0b67dfec9b212cb9d6e863c08a22153c05d747da (patch) | |
| tree | c3a9cebfe29cf02ef8927c72b728e163d540dc56 /tools/run_tests/artifacts | |
| parent | 01562865e5bbfcd98a5fdf539fe4a70df1cff3d2 (diff) | |
disable assembly optimizations for linux x86
Diffstat (limited to 'tools/run_tests/artifacts')
| -rw-r--r-- | tools/run_tests/artifacts/artifact_targets.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index b2e9f4cc9f..6a21810247 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -249,10 +249,21 @@ class CSharpExtArtifact: use_workspace=True) else: if self.platform == 'linux': + cmake_arch_option = '' # x64 is the default architecture + if self.arch == 'x86': + # TODO(jtattermusch): more work needed to enable + # boringssl assembly optimizations for 32-bit linux. + # Problem: currently we are building the artifact under + # 32-bit docker image, but CMAKE_SYSTEM_PROCESSOR is still + # set to x86_64, so the resulting boringssl binary + # would have undefined symbols. + cmake_arch_option = '-DOPENSSL_NO_ASM=ON' return create_docker_jobspec( self.name, 'tools/dockerfile/grpc_artifact_linux_%s' % self.arch, - 'tools/run_tests/artifacts/build_artifact_csharp.sh') + 'tools/run_tests/artifacts/build_artifact_csharp.sh', + environ={'CMAKE_ARCH_OPTION': cmake_arch_option} + ) else: cmake_arch_option = '' # x64 is the default architecture if self.arch == 'x86': |