diff options
| author |  Jan Tattermusch <jan.tattermusch@gmail.com> | 2016-02-19 09:49:35 -0800 |
|---|---|---|
| committer |  Jan Tattermusch <jtattermusch@google.com> | 2016-02-19 13:20:50 -0800 |
| commit | e7b7d86fde3475978c3f7d4dfaabaf549152cd02 (patch) | |
| tree | 6024836540238a36bd4b641c321a8f9a70139596 /tools/run_tests/artifact_targets.py | |
| parent | e046f712c5ed1723972af41c1ff402a33d538e29 (diff) | |
fix protoc artifact build on mac
Diffstat (limited to 'tools/run_tests/artifact_targets.py')
| -rw-r--r-- | tools/run_tests/artifact_targets.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/run_tests/artifact_targets.py b/tools/run_tests/artifact_targets.py index 3933564273..5d678a561f 100644 --- a/tools/run_tests/artifact_targets.py +++ b/tools/run_tests/artifact_targets.py @@ -248,7 +248,9 @@ class ProtocArtifact: def build_jobspec(self): if self.platform != 'windows': cxxflags = '-DNDEBUG %s' % _ARCH_FLAG_MAP[self.arch] - ldflags = ' -static-libgcc -static-libstdc++ -s %s' % _ARCH_FLAG_MAP[self.arch] + ldflags = '%s' % _ARCH_FLAG_MAP[self.arch] + if self.platform != 'macos': + ldflags += ' -static-libgcc -static-libstdc++ -s' environ={'CONFIG': 'opt', 'CXXFLAGS': cxxflags, 'LDFLAGS': ldflags, @@ -259,7 +261,7 @@ class ProtocArtifact: 'tools/run_tests/build_artifact_protoc.sh', environ=environ) else: - environ['CXXFLAGS'] += ' %s' % _MACOS_COMPAT_FLAG + environ['CXXFLAGS'] += ' -std=c++11 -stdlib=libc++ %s' % _MACOS_COMPAT_FLAG return create_jobspec(self.name, ['tools/run_tests/build_artifact_protoc.sh'], environ=environ) |