diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2017-05-12 12:25:43 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-05-12 12:25:43 -0700 |
| commit | 04f97ca02282cd57fdc65fe798f94feb94c2d554 (patch) | |
| tree | f9f638167c2116a57bd65434c172853f78d7da7f /tools/run_tests/artifacts/artifact_targets.py | |
| parent | c8a6822b0e0afa53b2ec4c92610f7175e4be5127 (diff) | |
| parent | a2d9d48a888bf9162d1288496e60920b481bf3eb (diff) | |
Merge branch 'master' into backward-compat-dev
Diffstat (limited to 'tools/run_tests/artifacts/artifact_targets.py')
| -rw-r--r-- | tools/run_tests/artifacts/artifact_targets.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/run_tests/artifacts/artifact_targets.py b/tools/run_tests/artifacts/artifact_targets.py index 04702bacca..c90da066c3 100644 --- a/tools/run_tests/artifacts/artifact_targets.py +++ b/tools/run_tests/artifacts/artifact_targets.py @@ -202,6 +202,7 @@ class CSharpExtArtifact: 'EMBED_OPENSSL': 'true', 'EMBED_ZLIB': 'true', 'CFLAGS': '-DGPR_BACKWARDS_COMPATIBILITY_MODE', + 'CXXFLAGS': '-DGPR_BACKWARDS_COMPATIBILITY_MODE', 'LDFLAGS': ''} if self.platform == 'linux': return create_docker_jobspec(self.name, @@ -211,6 +212,7 @@ class CSharpExtArtifact: else: archflag = _ARCH_FLAG_MAP[self.arch] environ['CFLAGS'] += ' %s %s' % (archflag, _MACOS_COMPAT_FLAG) + environ['CXXFLAGS'] += ' %s %s' % (archflag, _MACOS_COMPAT_FLAG) environ['LDFLAGS'] += ' %s' % archflag return create_jobspec(self.name, ['tools/run_tests/artifacts/build_artifact_csharp.sh'], |