From e7b7d86fde3475978c3f7d4dfaabaf549152cd02 Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jan.tattermusch@gmail.com>
Date: Fri, 19 Feb 2016 09:49:35 -0800
Subject: [PATCH] fix protoc artifact build on mac
---
tools/run_tests/artifact_targets.py | 6 ++++--
1 file 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)
--
GitLab