Skip to content
Snippets Groups Projects
Commit e7b7d86f authored by Jan Tattermusch's avatar Jan Tattermusch Committed by Jan Tattermusch
Browse files

fix protoc artifact build on mac

parent e046f712
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment